Extract `discard_remaining_results` for mysql2 adapter

2 files changed, 6 insertions, 4 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 e4f31586d8..1fb0bd8d56 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
@@ -527,10 +527,8 @@ module ActiveRecord
       end
 
       def insert_fixtures_set(fixture_set, tables_to_delete = [])
-        iterate_over_results = -> { while raw_connection.next_result; end; }
-
         with_multi_statements do
-          super(fixture_set, tables_to_delete, &iterate_over_results)
+          super { discard_remaining_results }
         end
       end
 
diff --git a/activerecord/lib/active_record/connection_adapters/mysql/database_statements.rb b/activerecord/lib/active_record/connection_adapters/mysql/database_statements.rb
index 148a16328f..5beaeec9c4 100644
--- a/activerecord/lib/active_record/connection_adapters/mysql/database_statements.rb
+++ b/activerecord/lib/active_record/connection_adapters/mysql/database_statements.rb
@@ -11,7 +11,7 @@ module ActiveRecord
           else
             super
           end
-          @connection.next_result while @connection.more_results?
+          discard_remaining_results
           result
         end
 
@@ -58,6 +58,10 @@ module ActiveRecord
             @connection.last_id
           end
 
+          def discard_remaining_results
+            @connection.next_result while @connection.more_results?
+          end
+
           def exec_stmt_and_free(sql, name, binds, cache_stmt: false)
             # make sure we carry over any changes to ActiveRecord::Base.default_timezone that have been
             # made since we established the connection