Merge pull request rails#46511 from RubyElders/charset-optional-collation

Support optional collation in create_table output.

Author: yahonda

activerecord/test/cases/adapters/mysql2/table_options_test.rb

@@ -32,7 +32,7 @@ def teardown
   test "table options with CHARSET" do
     @connection.create_table "mysql_table_options", force: true, options: "CHARSET=latin1"
     output = dump_table_schema("mysql_table_options")
-    expected = /create_table "mysql_table_options", charset: "latin1", force: :cascade/
+    expected = /create_table "mysql_table_options", charset: "latin1"(?:, collation: "\w+")?, force: :cascade/
     assert_match expected, output
   end