1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/test/cases/helper.rb b/activerecord/test/cases/helper.rb
index 0a577fa2f5..f2ba28a32f 100644
--- a/activerecord/test/cases/helper.rb
+++ b/activerecord/test/cases/helper.rb
@@ -46,7 +46,7 @@ def in_memory_db?
 end
 
 def mysql_56?
-  current_adapter?(:Mysql2Adapter) &&
+  current_adapter?(:MysqlAdapter, :Mysql2Adapter) &&
     ActiveRecord::Base.connection.send(:version).join(".") >= "5.6.0"
 end
 
@@ -124,7 +124,7 @@ def enable_extension!(extension, connection)
   return connection.reconnect! if connection.extension_enabled?(extension)
 
   connection.enable_extension extension
-  connection.commit_db_transaction
+  connection.commit_db_transaction if connection.transaction_open?
   connection.reconnect!
 end