2 files changed, 31 insertions, 19 deletions
diff --git a/activerecord/test/cases/adapters/mysql2/explain_test.rb b/activerecord/test/cases/adapters/mysql2/explain_test.rb
index 4fc7414b18..b783b5fcd9 100644
--- a/activerecord/test/cases/adapters/mysql2/explain_test.rb
+++ b/activerecord/test/cases/adapters/mysql2/explain_test.rb
@@ -2,26 +2,20 @@ require "cases/helper"
 require 'models/developer'
 require 'models/computer'
 
-module ActiveRecord
-  module ConnectionAdapters
-    class Mysql2Adapter
-      class ExplainTest < ActiveRecord::Mysql2TestCase
-        fixtures :developers
+class Mysql2ExplainTest < ActiveRecord::Mysql2TestCase
+  fixtures :developers
 
-        def test_explain_for_one_query
-          explain = Developer.where(:id => 1).explain
-          assert_match %(EXPLAIN for: SELECT `developers`.* FROM `developers` WHERE `developers`.`id` = 1), explain
-          assert_match %r(developers |.* const), explain
-        end
+  def test_explain_for_one_query
+    explain = Developer.where(id: 1).explain
+    assert_match %(EXPLAIN for: SELECT `developers`.* FROM `developers` WHERE `developers`.`id` = 1), explain
+    assert_match %r(developers |.* const), explain
+  end
 
-        def test_explain_with_eager_loading
-          explain = Developer.where(:id => 1).includes(:audit_logs).explain
-          assert_match %(EXPLAIN for: SELECT `developers`.* FROM `developers` WHERE `developers`.`id` = 1), explain
-          assert_match %r(developers |.* const), explain
-          assert_match %(EXPLAIN for: SELECT `audit_logs`.* FROM `audit_logs` WHERE `audit_logs`.`developer_id` = 1), explain
-          assert_match %r(audit_logs |.* ALL), explain
-        end
-      end
-    end
+  def test_explain_with_eager_loading
+    explain = Developer.where(id: 1).includes(:audit_logs).explain
+    assert_match %(EXPLAIN for: SELECT `developers`.* FROM `developers` WHERE `developers`.`id` = 1), explain
+    assert_match %r(developers |.* const), explain
+    assert_match %(EXPLAIN for: SELECT `audit_logs`.* FROM `audit_logs` WHERE `audit_logs`.`developer_id` = 1), explain
+    assert_match %r(audit_logs |.* ALL), explain
   end
 end
diff --git a/activerecord/test/cases/adapters/mysql2/mysql2_adapter_test.rb b/activerecord/test/cases/adapters/mysql2/mysql2_adapter_test.rb
index 4efd728754..00d23740b6 100644
--- a/activerecord/test/cases/adapters/mysql2/mysql2_adapter_test.rb
+++ b/activerecord/test/cases/adapters/mysql2/mysql2_adapter_test.rb
@@ -1,10 +1,22 @@
 require "cases/helper"
+require "support/ddl_helper"
 
 class Mysql2AdapterTest < ActiveRecord::Mysql2TestCase
+  include DdlHelper
+
   def setup
     @conn = ActiveRecord::Base.connection
   end
 
+  def test_exec_query_nothing_raises_with_no_result_queries
+    assert_nothing_raised do
+      with_example_table do
+        @conn.exec_query('INSERT INTO ex (number) VALUES (1)')
+        @conn.exec_query('DELETE FROM ex WHERE number = 1')
+      end
+    end
+  end
+
   def test_columns_for_distinct_zero_orders
     assert_equal "posts.id",
       @conn.columns_for_distinct("posts.id", [])
@@ -41,4 +53,10 @@ class Mysql2AdapterTest < ActiveRecord::Mysql2TestCase
     assert_equal "posts.id, posts.created_at AS alias_0",
       @conn.columns_for_distinct("posts.id", [order])
   end
+
+  private
+
+  def with_example_table(definition = 'id int auto_increment primary key, number int, data varchar(255)', &block)
+    super(@conn, 'ex', definition, &block)
+  end
 end