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

1 files changed, 19 insertions, 17 deletions

diff --git a/activerecord/test/cases/migration_test.rb b/activerecord/test/cases/migration_test.rb
index 633077622c..270e446c69 100644
--- a/activerecord/test/cases/migration_test.rb
+++ b/activerecord/test/cases/migration_test.rb
@@ -430,30 +430,32 @@ class MigrationTest < ActiveRecord::TestCase
     Person.connection.drop_table :binary_testings rescue nil
   end
 
-  def test_create_table_with_query
-    Person.connection.drop_table :table_from_query_testings rescue nil
-    Person.connection.create_table(:person, force: true)
+  unless mysql_enforcing_gtid_consistency?
+    def test_create_table_with_query
+      Person.connection.drop_table :table_from_query_testings rescue nil
+      Person.connection.create_table(:person, force: true)
 
-    Person.connection.create_table :table_from_query_testings, as: "SELECT id FROM person"
+      Person.connection.create_table :table_from_query_testings, as: "SELECT id FROM person"
 
-    columns = Person.connection.columns(:table_from_query_testings)
-    assert_equal 1, columns.length
-    assert_equal "id", columns.first.name
+      columns = Person.connection.columns(:table_from_query_testings)
+      assert_equal 1, columns.length
+      assert_equal "id", columns.first.name
 
-    Person.connection.drop_table :table_from_query_testings rescue nil
-  end
+      Person.connection.drop_table :table_from_query_testings rescue nil
+    end
 
-  def test_create_table_with_query_from_relation
-    Person.connection.drop_table :table_from_query_testings rescue nil
-    Person.connection.create_table(:person, force: true)
+    def test_create_table_with_query_from_relation
+      Person.connection.drop_table :table_from_query_testings rescue nil
+      Person.connection.create_table(:person, force: true)
 
-    Person.connection.create_table :table_from_query_testings, as: Person.select(:id)
+      Person.connection.create_table :table_from_query_testings, as: Person.select(:id)
 
-    columns = Person.connection.columns(:table_from_query_testings)
-    assert_equal 1, columns.length
-    assert_equal "id", columns.first.name
+      columns = Person.connection.columns(:table_from_query_testings)
+      assert_equal 1, columns.length
+      assert_equal "id", columns.first.name
 
-    Person.connection.drop_table :table_from_query_testings rescue nil
+      Person.connection.drop_table :table_from_query_testings rescue nil
+    end
   end
 
   if current_adapter? :OracleAdapter