Merge remote-tracking branch 'origin/master' into guides-template-inheritance

3 files changed, 14 insertions, 6 deletions

diff --git a/activerecord/test/cases/adapters/mysql2/boolean_test.rb b/activerecord/test/cases/adapters/mysql2/boolean_test.rb
index f3c711a64b..03627135b2 100644
--- a/activerecord/test/cases/adapters/mysql2/boolean_test.rb
+++ b/activerecord/test/cases/adapters/mysql2/boolean_test.rb
@@ -9,6 +9,7 @@ class Mysql2BooleanTest < ActiveRecord::TestCase
 
   setup do
     @connection = ActiveRecord::Base.connection
+    @connection.clear_cache!
     @connection.create_table("mysql_booleans") do |t|
       t.boolean "archived"
       t.string "published", limit: 1
diff --git a/activerecord/test/cases/adapters/mysql2/connection_test.rb b/activerecord/test/cases/adapters/mysql2/connection_test.rb
index beedb4f3a1..0b2f59b0eb 100644
--- a/activerecord/test/cases/adapters/mysql2/connection_test.rb
+++ b/activerecord/test/cases/adapters/mysql2/connection_test.rb
@@ -52,6 +52,11 @@ class MysqlConnectionTest < ActiveRecord::TestCase
     assert @connection.active?
   end
 
+  def test_mysql_connection_collation_is_configured
+    assert_equal 'utf8_unicode_ci', @connection.show_variable('collation_connection')
+    assert_equal 'utf8_general_ci', ARUnit2Model.connection.show_variable('collation_connection')
+  end
+
   # TODO: Below is a straight up copy/paste from mysql/connection_test.rb
   # I'm not sure what the correct way is to share these tests between
   # adapters in minitest.
diff --git a/activerecord/test/cases/adapters/mysql2/schema_test.rb b/activerecord/test/cases/adapters/mysql2/schema_test.rb
index 43c9116b5a..1b7e60565d 100644
--- a/activerecord/test/cases/adapters/mysql2/schema_test.rb
+++ b/activerecord/test/cases/adapters/mysql2/schema_test.rb
@@ -66,12 +66,14 @@ module ActiveRecord
         assert_equal :fulltext, index_c.type
       end
 
-      def test_drop_temporary_table
-        @connection.transaction do
-          @connection.create_table(:temp_table, temporary: true)
-          # if it doesn't properly say DROP TEMPORARY TABLE, the transaction commit
-          # will complain that no transaction is active
-          @connection.drop_table(:temp_table, temporary: true)
+      unless mysql_enforcing_gtid_consistency?
+        def test_drop_temporary_table
+          @connection.transaction do
+            @connection.create_table(:temp_table, temporary: true)
+            # if it doesn't properly say DROP TEMPORARY TABLE, the transaction commit
+            # will complain that no transaction is active
+            @connection.drop_table(:temp_table, temporary: true)
+          end
         end
       end
     end