From 4ef78c8524eaeb08c05d537e95484ffc93149640 Mon Sep 17 00:00:00 2001 From: Morgan Tocker Date: Sat, 8 Sep 2018 11:03:51 -0600 Subject: [PATCH 1/2] Clarified default characterset. --- sql/character-set-configuration.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sql/character-set-configuration.md b/sql/character-set-configuration.md index 069acd00ca94d..262f715a042f7 100644 --- a/sql/character-set-configuration.md +++ b/sql/character-set-configuration.md @@ -6,6 +6,6 @@ category: user guide # Character Set Configuration -Currently, TiDB does not support configuring the character set. The default character set is `utf8mb4`. +Currently, TiDB only supports the `utf8` character set, which is the equivalent to `utf8mb4` in MySQL. Since MySQL 5.7 defaults to latin1, this difference is documented under [default differences](mysql-compatibility.md#default-differences) between TiDB and MySQL. -For more information, see [Character Set Configuration in MySQL](https://dev.mysql.com/doc/refman/5.7/en/charset-configuration.html). \ No newline at end of file +For more information, see [Character Set Configuration in MySQL](https://dev.mysql.com/doc/refman/5.7/en/charset-configuration.html). From 7bf70478c2f1120e0bab66354050b4bc948edc46 Mon Sep 17 00:00:00 2001 From: Morgan Tocker Date: Sat, 8 Sep 2018 11:06:20 -0600 Subject: [PATCH 2/2] latin1 keyword as code --- sql/character-set-configuration.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sql/character-set-configuration.md b/sql/character-set-configuration.md index 262f715a042f7..1103f90218039 100644 --- a/sql/character-set-configuration.md +++ b/sql/character-set-configuration.md @@ -6,6 +6,6 @@ category: user guide # Character Set Configuration -Currently, TiDB only supports the `utf8` character set, which is the equivalent to `utf8mb4` in MySQL. Since MySQL 5.7 defaults to latin1, this difference is documented under [default differences](mysql-compatibility.md#default-differences) between TiDB and MySQL. +Currently, TiDB only supports the `utf8` character set, which is the equivalent to `utf8mb4` in MySQL. Since MySQL 5.7 defaults to `latin1`, this difference is documented under [default differences](mysql-compatibility.md#default-differences) between TiDB and MySQL. For more information, see [Character Set Configuration in MySQL](https://dev.mysql.com/doc/refman/5.7/en/charset-configuration.html).