2 files changed, 24 insertions, 22 deletions
diff --git a/activerecord/test/cases/adapters/mysql/sp_test.rb b/activerecord/test/cases/adapters/mysql/sp_test.rb
index 579c3273c6..7849248dcc 100644
--- a/activerecord/test/cases/adapters/mysql/sp_test.rb
+++ b/activerecord/test/cases/adapters/mysql/sp_test.rb
@@ -7,23 +7,24 @@ class MysqlStoredProcedureTest < ActiveRecord::MysqlTestCase
 
   def setup
     @connection = ActiveRecord::Base.connection
+    unless ActiveRecord::Base.connection.version >= '5.6.0' || Mysql.const_defined?(:CLIENT_MULTI_RESULTS)
+      skip("no stored procedure support")
+    end
   end
 
   # Test that MySQL allows multiple results for stored procedures
   #
   # In MySQL 5.6, CLIENT_MULTI_RESULTS is enabled by default.
   # http://dev.mysql.com/doc/refman/5.6/en/call.html
-  if ActiveRecord::Base.connection.version >= '5.6.0' || Mysql.const_defined?(:CLIENT_MULTI_RESULTS)
-    def test_multi_results
-      rows = @connection.select_rows('CALL ten();')
-      assert_equal 10, rows[0][0].to_i, "ten() did not return 10 as expected: #{rows.inspect}"
-      assert @connection.active?, "Bad connection use by 'MysqlAdapter.select_rows'"
-    end
+  def test_multi_results
+    rows = @connection.select_rows('CALL ten();')
+    assert_equal 10, rows[0][0].to_i, "ten() did not return 10 as expected: #{rows.inspect}"
+    assert @connection.active?, "Bad connection use by 'MysqlAdapter.select_rows'"
+  end
 
-    def test_multi_results_from_find_by_sql
-      topics = Topic.find_by_sql 'CALL topics(3);'
-      assert_equal 3, topics.size
-      assert @connection.active?, "Bad connection use by 'MysqlAdapter.select'"
-    end
+  def test_multi_results_from_find_by_sql
+    topics = Topic.find_by_sql 'CALL topics(3);'
+    assert_equal 3, topics.size
+    assert @connection.active?, "Bad connection use by 'MysqlAdapter.select'"
   end
 end
diff --git a/activerecord/test/cases/adapters/mysql2/sp_test.rb b/activerecord/test/cases/adapters/mysql2/sp_test.rb
index 8b12945f24..cdaa2cca44 100644
--- a/activerecord/test/cases/adapters/mysql2/sp_test.rb
+++ b/activerecord/test/cases/adapters/mysql2/sp_test.rb
@@ -7,23 +7,24 @@ class Mysql2StoredProcedureTest < ActiveRecord::Mysql2TestCase
 
   def setup
     @connection = ActiveRecord::Base.connection
+    unless ActiveRecord::Base.connection.version >= '5.6.0'
+      skip("no stored procedure support")
+    end
   end
 
   # Test that MySQL allows multiple results for stored procedures
   #
   # In MySQL 5.6, CLIENT_MULTI_RESULTS is enabled by default.
   # http://dev.mysql.com/doc/refman/5.6/en/call.html
-  if ActiveRecord::Base.connection.version >= '5.6.0'
-    def test_multi_results
-      rows = @connection.select_rows('CALL ten();')
-      assert_equal 10, rows[0][0].to_i, "ten() did not return 10 as expected: #{rows.inspect}"
-      assert @connection.active?, "Bad connection use by 'Mysql2Adapter.select_rows'"
-    end
+  def test_multi_results
+    rows = @connection.select_rows('CALL ten();')
+    assert_equal 10, rows[0][0].to_i, "ten() did not return 10 as expected: #{rows.inspect}"
+    assert @connection.active?, "Bad connection use by 'Mysql2Adapter.select_rows'"
+  end
 
-    def test_multi_results_from_find_by_sql
-      topics = Topic.find_by_sql 'CALL topics(3);'
-      assert_equal 3, topics.size
-      assert @connection.active?, "Bad connection use by 'Mysql2Adapter.select'"
-    end
+  def test_multi_results_from_find_by_sql
+    topics = Topic.find_by_sql 'CALL topics(3);'
+    assert_equal 3, topics.size
+    assert @connection.active?, "Bad connection use by 'Mysql2Adapter.select'"
   end
 end