cherry pick #6124 to release-3.0

Signed-off-by: ti-srebot <[email protected]>
pingcap · Apr 23, 2021 · 01bbf90 · 01bbf90
1 parent d875f0f
commit 01bbf90
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/character-set-and-collation.md b/character-set-and-collation.md
@@ -129,7 +129,11 @@ ALTER DATABASE db_name
 {{< copyable "sql" >}}
 
 ```sql
+<<<<<<< HEAD
 CREATE SCHEMA test1 CHARACTER SET utf8 COLLATE uft8_general_ci;
+=======
+CREATE SCHEMA test1 CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;
+>>>>>>> 41d6eac6... Fix a typo in Update character-set-and-collation.md (#6124)
 ```
 
 ```
@@ -156,7 +160,11 @@ SELECT @@character_set_database, @@collation_database;
 +--------------------------|----------------------+
 | @@character_set_database | @@collation_database |
 +--------------------------|----------------------+
+<<<<<<< HEAD
 | utf8                     | uft8_general_ci      |
+=======
+| utf8mb4                  | utf8mb4_general_ci   |
+>>>>>>> 41d6eac6... Fix a typo in Update character-set-and-collation.md (#6124)
 +--------------------------|----------------------+
 1 row in set (0.00 sec)
 ```