Merge pull request #21932 from kamipo/add_stored_procedure_test_in_mysql2

Add stored procedure test in mysql2

2 files changed, 8 insertions, 5 deletions

diff --git a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
index e9365cf8d0..e139092659 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
@@ -168,6 +168,10 @@ module ActiveRecord
         end
       end
 
+      def version
+        @version ||= Version.new(full_version.match(/^\d+\.\d+\.\d+/)[0])
+      end
+
       # Returns true, since this connection adapter supports migrations.
       def supports_migrations?
         true
@@ -931,10 +935,6 @@ module ActiveRecord
         subselect.from subsubselect.distinct.as('__active_record_temp')
       end
 
-      def version
-        @version ||= Version.new(full_version.match(/^\d+\.\d+\.\d+/)[0])
-      end
-
       def mariadb?
         full_version =~ /mariadb/i
       end
diff --git a/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
index 4461722bb4..6d5f31c6ca 100644
--- a/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
@@ -126,7 +126,9 @@ module ActiveRecord
       # Returns an array of arrays containing the field values.
       # Order is the same as that returned by +columns+.
       def select_rows(sql, name = nil, binds = [])
-        execute(sql, name).to_a
+        result = execute(sql, name)
+        @connection.next_result while @connection.more_results?
+        result.to_a
       end
 
       # Executes the SQL statement in the context of this connection.
@@ -142,6 +144,7 @@ module ActiveRecord
 
       def exec_query(sql, name = 'SQL', binds = [])
         result = execute(sql, name)
+        @connection.next_result while @connection.more_results?
         ActiveRecord::Result.new(result.fields, result.to_a)
       end