From 4135ab318a24479443fdd4f2ca62d06a5080c526 Mon Sep 17 00:00:00 2001 From: juliezhang1112 <1060074157@qq.com> Date: Wed, 21 Aug 2019 16:43:29 +0800 Subject: [PATCH 1/6] tidb-in-kubernetes, TOC: rename and add aliases for local PV file --- dev/TOC.md | 2 +- .../reference/configuration/{local-pv.md => storage-class.md} | 3 ++- v3.0/tidb-in-kubernetes/deploy/tidb-operator.md | 2 +- .../reference/configuration/{local-pv.md => storage-class.md} | 3 ++- 4 files changed, 6 insertions(+), 4 deletions(-) rename dev/tidb-in-kubernetes/reference/configuration/{local-pv.md => storage-class.md} (96%) rename v3.0/tidb-in-kubernetes/reference/configuration/{local-pv.md => storage-class.md} (95%) diff --git a/dev/TOC.md b/dev/TOC.md index 04741e5c47b01..ba85a7ac60df3 100644 --- a/dev/TOC.md +++ b/dev/TOC.md @@ -358,7 +358,7 @@ + Configuration - [TiDB Cluster](tidb-in-kubernetes/reference/configuration/tidb-cluster.md) - [Backup](tidb-in-kubernetes/reference/configuration/backup.md) - - [Local PV](tidb-in-kubernetes/reference/configuration/local-pv.md) + - [PV](tidb-in-kubernetes/reference/configuration/storage-class.md) + Tools - [tkctl](tidb-in-kubernetes/reference/tools/tkctl.md) - [Tools in Kubernetes](tidb-in-kubernetes/reference/tools/in-kubernetes.md) diff --git a/dev/tidb-in-kubernetes/reference/configuration/local-pv.md b/dev/tidb-in-kubernetes/reference/configuration/storage-class.md similarity index 96% rename from dev/tidb-in-kubernetes/reference/configuration/local-pv.md rename to dev/tidb-in-kubernetes/reference/configuration/storage-class.md index f158f211d0e06..e0c0938ef72aa 100644 --- a/dev/tidb-in-kubernetes/reference/configuration/local-pv.md +++ b/dev/tidb-in-kubernetes/reference/configuration/storage-class.md @@ -1,7 +1,8 @@ --- title: Local PV Configuration summary: Learn how to manage local PV (Persistent Volume). -category: how-to +category: reference +aliases: ['/docs/dev/tidb-in-kubernetes/reference/configuration/local-pv/'] --- # Local PV Configuration diff --git a/v3.0/tidb-in-kubernetes/deploy/tidb-operator.md b/v3.0/tidb-in-kubernetes/deploy/tidb-operator.md index 4783484a9e0e3..d6a651960d779 100644 --- a/v3.0/tidb-in-kubernetes/deploy/tidb-operator.md +++ b/v3.0/tidb-in-kubernetes/deploy/tidb-operator.md @@ -68,7 +68,7 @@ Refer to [Use Helm](/tidb-in-kubernetes/reference/tools/in-kubernetes.md#use-hel ### Prepare local volumes -Refer to [Local PV Configuration](/tidb-in-kubernetes/reference/configuration/local-pv.md) to set up local persistent volumes in your Kubernetes cluster. +Refer to [Local PV Configuration](/tidb-in-kubernetes/reference/configuration/storage-class.md) to set up local persistent volumes in your Kubernetes cluster. ### Deploy local-static-provisioner diff --git a/v3.0/tidb-in-kubernetes/reference/configuration/local-pv.md b/v3.0/tidb-in-kubernetes/reference/configuration/storage-class.md similarity index 95% rename from v3.0/tidb-in-kubernetes/reference/configuration/local-pv.md rename to v3.0/tidb-in-kubernetes/reference/configuration/storage-class.md index f158f211d0e06..a0903affede38 100644 --- a/v3.0/tidb-in-kubernetes/reference/configuration/local-pv.md +++ b/v3.0/tidb-in-kubernetes/reference/configuration/storage-class.md @@ -1,7 +1,8 @@ --- title: Local PV Configuration summary: Learn how to manage local PV (Persistent Volume). -category: how-to +category: reference +aliases: ['/docs/v3.0/tidb-in-kubernetes/reference/configuration/local-pv/'] --- # Local PV Configuration From eb4ee43e58baeaa2ef50893b22480fda35f67c76 Mon Sep 17 00:00:00 2001 From: juliezhang1112 <1060074157@qq.com> Date: Mon, 26 Aug 2019 20:35:21 +0800 Subject: [PATCH 2/6] resolve rename conflict with other PR --- .../reference/configuration/{storage-class.md => local-pv.md} | 0 .../reference/configuration/{storage-class.md => local-pv.md} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename dev/tidb-in-kubernetes/reference/configuration/{storage-class.md => local-pv.md} (100%) rename v3.0/tidb-in-kubernetes/reference/configuration/{storage-class.md => local-pv.md} (100%) diff --git a/dev/tidb-in-kubernetes/reference/configuration/storage-class.md b/dev/tidb-in-kubernetes/reference/configuration/local-pv.md similarity index 100% rename from dev/tidb-in-kubernetes/reference/configuration/storage-class.md rename to dev/tidb-in-kubernetes/reference/configuration/local-pv.md diff --git a/v3.0/tidb-in-kubernetes/reference/configuration/storage-class.md b/v3.0/tidb-in-kubernetes/reference/configuration/local-pv.md similarity index 100% rename from v3.0/tidb-in-kubernetes/reference/configuration/storage-class.md rename to v3.0/tidb-in-kubernetes/reference/configuration/local-pv.md From f5a3a30bb97829564907910082bf17b098fff414 Mon Sep 17 00:00:00 2001 From: juliezhang1112 <1060074157@qq.com> Date: Wed, 28 Aug 2019 18:05:18 +0800 Subject: [PATCH 3/6] undo unmerged changes --- dev/tidb-in-kubernetes/reference/configuration/local-pv.md | 3 +-- v3.0/tidb-in-kubernetes/deploy/tidb-operator.md | 2 +- v3.0/tidb-in-kubernetes/reference/configuration/local-pv.md | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dev/tidb-in-kubernetes/reference/configuration/local-pv.md b/dev/tidb-in-kubernetes/reference/configuration/local-pv.md index e0c0938ef72aa..f158f211d0e06 100644 --- a/dev/tidb-in-kubernetes/reference/configuration/local-pv.md +++ b/dev/tidb-in-kubernetes/reference/configuration/local-pv.md @@ -1,8 +1,7 @@ --- title: Local PV Configuration summary: Learn how to manage local PV (Persistent Volume). -category: reference -aliases: ['/docs/dev/tidb-in-kubernetes/reference/configuration/local-pv/'] +category: how-to --- # Local PV Configuration diff --git a/v3.0/tidb-in-kubernetes/deploy/tidb-operator.md b/v3.0/tidb-in-kubernetes/deploy/tidb-operator.md index 7cefa1b1b787e..d0d9d9449f228 100644 --- a/v3.0/tidb-in-kubernetes/deploy/tidb-operator.md +++ b/v3.0/tidb-in-kubernetes/deploy/tidb-operator.md @@ -69,7 +69,7 @@ Refer to [Use Helm](/tidb-in-kubernetes/reference/tools/in-kubernetes.md#use-hel ### Prepare local volumes -Refer to [Local PV Configuration](/tidb-in-kubernetes/reference/configuration/storage-class.md) to set up local persistent volumes in your Kubernetes cluster. +Refer to [Local PV Configuration](/tidb-in-kubernetes/reference/configuration/local-pv.md) to set up local persistent volumes in your Kubernetes cluster. ### Deploy local-static-provisioner diff --git a/v3.0/tidb-in-kubernetes/reference/configuration/local-pv.md b/v3.0/tidb-in-kubernetes/reference/configuration/local-pv.md index a0903affede38..f158f211d0e06 100644 --- a/v3.0/tidb-in-kubernetes/reference/configuration/local-pv.md +++ b/v3.0/tidb-in-kubernetes/reference/configuration/local-pv.md @@ -1,8 +1,7 @@ --- title: Local PV Configuration summary: Learn how to manage local PV (Persistent Volume). -category: reference -aliases: ['/docs/v3.0/tidb-in-kubernetes/reference/configuration/local-pv/'] +category: how-to --- # Local PV Configuration From 0e7b4900161ef1e67e7b09bb05b1babe3c83283a Mon Sep 17 00:00:00 2001 From: juliezhang1112 <1060074157@qq.com> Date: Sun, 29 Sep 2019 17:01:50 +0800 Subject: [PATCH 4/6] reference: change the description of SQL_MODE --- dev/reference/mysql-compatibility.md | 2 +- .../sql/functions-and-operators/aggregate-group-by-functions.md | 2 +- v2.1/reference/mysql-compatibility.md | 2 +- .../sql/functions-and-operators/aggregate-group-by-functions.md | 2 +- v3.0/reference/mysql-compatibility.md | 2 +- .../sql/functions-and-operators/aggregate-group-by-functions.md | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dev/reference/mysql-compatibility.md b/dev/reference/mysql-compatibility.md index 9bd9d12c69887..976abd0a714d4 100644 --- a/dev/reference/mysql-compatibility.md +++ b/dev/reference/mysql-compatibility.md @@ -25,7 +25,7 @@ However, TiDB does not support some of MySQL features or behaves differently fro + `FOREIGN KEY` constraints + `FULLTEXT` functions and indexes + `SPATIAL` functions and indexes -+ Character sets other than `utf8mb4` and `utf8` ++ Unicode character sets other than `utf8mb4` and `utf8` + Collations other than `BINARY` + Add primary key + Drop primary key diff --git a/dev/reference/sql/functions-and-operators/aggregate-group-by-functions.md b/dev/reference/sql/functions-and-operators/aggregate-group-by-functions.md index 95af06bd77e7e..158e46f5f17dd 100644 --- a/dev/reference/sql/functions-and-operators/aggregate-group-by-functions.md +++ b/dev/reference/sql/functions-and-operators/aggregate-group-by-functions.md @@ -55,7 +55,7 @@ mysql> select a, b, sum(c) from t group by a; ERROR 1055 (42000): Expression #2 of SELECT list is not in GROUP BY clause and contains nonaggregated column 'b' which is not functionally dependent on columns in GROUP BY clause; this is incompatible with sql_mode=only_full_group_by ``` -TiDB does not currently enable the [`ONLY_FULL_GROUP_BY`](/dev/reference/mysql-compatibility.md#default-differences) mode by default. +TiDB currently enables the [`ONLY_FULL_GROUP_BY`](/dev/reference/mysql-compatibility.md#default-differences) mode by default. ### Differences from MySQL diff --git a/v2.1/reference/mysql-compatibility.md b/v2.1/reference/mysql-compatibility.md index b377e3710b36c..f338c620992f6 100644 --- a/v2.1/reference/mysql-compatibility.md +++ b/v2.1/reference/mysql-compatibility.md @@ -24,7 +24,7 @@ Currently TiDB Server advertises itself as MySQL 5.7 and works with most MySQL d + `FOREIGN KEY` constraints + `FULLTEXT` functions and indexes + `SPATIAL` functions and indexes -+ Character sets other than `utf8` ++ Unicode character sets other than `utf8` + Collations other than `BINARY` + Add primary key + Drop primary key diff --git a/v2.1/reference/sql/functions-and-operators/aggregate-group-by-functions.md b/v2.1/reference/sql/functions-and-operators/aggregate-group-by-functions.md index 75c11df888532..ed782637d9d61 100644 --- a/v2.1/reference/sql/functions-and-operators/aggregate-group-by-functions.md +++ b/v2.1/reference/sql/functions-and-operators/aggregate-group-by-functions.md @@ -55,7 +55,7 @@ mysql> select a, b, sum(c) from t group by a; ERROR 1055 (42000): Expression #2 of SELECT list is not in GROUP BY clause and contains nonaggregated column 'b' which is not functionally dependent on columns in GROUP BY clause; this is incompatible with sql_mode=only_full_group_by ``` -TiDB does not currently enable the [`ONLY_FULL_GROUP_BY`](/v2.1/reference/mysql-compatibility.md#default-differences) mode by default. +TiDB currently enables the [`ONLY_FULL_GROUP_BY`](/v2.1/reference/mysql-compatibility.md#default-differences) mode by default. ### Differences from MySQL diff --git a/v3.0/reference/mysql-compatibility.md b/v3.0/reference/mysql-compatibility.md index ccb2f930d1f3e..c9bd8b3fa674b 100644 --- a/v3.0/reference/mysql-compatibility.md +++ b/v3.0/reference/mysql-compatibility.md @@ -25,7 +25,7 @@ However, TiDB does not support some of MySQL features or behaves differently fro + `FOREIGN KEY` constraints + `FULLTEXT` functions and indexes + `SPATIAL` functions and indexes -+ Character sets other than `utf8mb4` and `utf8` ++ Unicode character sets other than `utf8mb4` and `utf8` + Collations other than `BINARY` + Add primary key + Drop primary key diff --git a/v3.0/reference/sql/functions-and-operators/aggregate-group-by-functions.md b/v3.0/reference/sql/functions-and-operators/aggregate-group-by-functions.md index 6ce1d5f879346..24fe5bd62b3f0 100644 --- a/v3.0/reference/sql/functions-and-operators/aggregate-group-by-functions.md +++ b/v3.0/reference/sql/functions-and-operators/aggregate-group-by-functions.md @@ -56,7 +56,7 @@ mysql> select a, b, sum(c) from t group by a; ERROR 1055 (42000): Expression #2 of SELECT list is not in GROUP BY clause and contains nonaggregated column 'b' which is not functionally dependent on columns in GROUP BY clause; this is incompatible with sql_mode=only_full_group_by ``` -TiDB does not currently enable the [`ONLY_FULL_GROUP_BY`](/v3.0/reference/mysql-compatibility.md#default-differences) mode by default. +TiDB currently enables the [`ONLY_FULL_GROUP_BY`](/v3.0/reference/mysql-compatibility.md#default-differences) mode by default. ### Differences from MySQL From 23c085209cb102e653e36a7f8e8af74c10a232a1 Mon Sep 17 00:00:00 2001 From: juliezhang1112 <1060074157@qq.com> Date: Fri, 11 Oct 2019 11:24:32 +0800 Subject: [PATCH 5/6] reference/mysql-compatibility: update supported character sets --- dev/reference/mysql-compatibility.md | 2 +- v3.0/reference/mysql-compatibility.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dev/reference/mysql-compatibility.md b/dev/reference/mysql-compatibility.md index fbac597a7de7d..6760d8c051b41 100644 --- a/dev/reference/mysql-compatibility.md +++ b/dev/reference/mysql-compatibility.md @@ -25,7 +25,7 @@ However, TiDB does not support some of MySQL features or behaves differently fro + `FOREIGN KEY` constraints + `FULLTEXT` functions and indexes + `SPATIAL` functions and indexes -+ Unicode character sets other than `utf8mb4` and `utf8` ++ Character sets other than `utf8`, `utf8mb4`, `ascii`, `latin1` and `binary` + Collations other than `BINARY` + Add primary key + Drop primary key diff --git a/v3.0/reference/mysql-compatibility.md b/v3.0/reference/mysql-compatibility.md index 423c9f58e900b..d2b2f6779ddc4 100644 --- a/v3.0/reference/mysql-compatibility.md +++ b/v3.0/reference/mysql-compatibility.md @@ -25,7 +25,7 @@ However, TiDB does not support some of MySQL features or behaves differently fro + `FOREIGN KEY` constraints + `FULLTEXT` functions and indexes + `SPATIAL` functions and indexes -+ Unicode character sets other than `utf8mb4` and `utf8` ++ Character sets other than `utf8`, `utf8mb4`, `ascii`, `latin1` and `binary` + Collations other than `BINARY` + Add primary key + Drop primary key From c739674f8093e1afd5ae7c05738bc86fa46b8969 Mon Sep 17 00:00:00 2001 From: juliezhang1112 <1060074157@qq.com> Date: Fri, 11 Oct 2019 11:34:17 +0800 Subject: [PATCH 6/6] v2.1: update supported character sets --- v2.1/reference/mysql-compatibility.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/v2.1/reference/mysql-compatibility.md b/v2.1/reference/mysql-compatibility.md index 142447c1028e0..752053182f6f3 100644 --- a/v2.1/reference/mysql-compatibility.md +++ b/v2.1/reference/mysql-compatibility.md @@ -24,7 +24,7 @@ Currently TiDB Server advertises itself as MySQL 5.7 and works with most MySQL d + `FOREIGN KEY` constraints + `FULLTEXT` functions and indexes + `SPATIAL` functions and indexes -+ Unicode character sets other than `utf8` ++ Character sets other than `utf8`, `utf8mb4`, `ascii`, `latin1` and `binary` + Collations other than `BINARY` + Add primary key + Drop primary key