From 53b3fe3b9230783b0665ddc7f24afb33683c5b12 Mon Sep 17 00:00:00 2001 From: Ran Date: Tue, 8 Aug 2023 10:28:16 +0800 Subject: [PATCH 1/3] Add temp.md --- temp.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 temp.md diff --git a/temp.md b/temp.md new file mode 100644 index 0000000000000..af27ff4986a7b --- /dev/null +++ b/temp.md @@ -0,0 +1 @@ +This is a test file. \ No newline at end of file From 3443dc797e08aa9ea4f9710022f0209df0dfceca Mon Sep 17 00:00:00 2001 From: Ran Date: Tue, 8 Aug 2023 10:28:20 +0800 Subject: [PATCH 2/3] Delete temp.md --- temp.md | 1 - 1 file changed, 1 deletion(-) delete mode 100644 temp.md diff --git a/temp.md b/temp.md deleted file mode 100644 index af27ff4986a7b..0000000000000 --- a/temp.md +++ /dev/null @@ -1 +0,0 @@ -This is a test file. \ No newline at end of file From 05e6a2c1794f5d56ae45a13156684080148ecf0f Mon Sep 17 00:00:00 2001 From: Ran Date: Tue, 8 Aug 2023 10:42:10 +0800 Subject: [PATCH 3/3] add translation Signed-off-by: Ran --- tidb-configuration-file.md | 4 ++++ upgrade-tidb-using-tiup.md | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/tidb-configuration-file.md b/tidb-configuration-file.md index 34adf0705040f..05490a1532356 100644 --- a/tidb-configuration-file.md +++ b/tidb-configuration-file.md @@ -123,6 +123,10 @@ The TiDB configuration file supports more options than command-line parameters. + Default value: "" + By default, the format of the TiDB version string is `5.7.${mysql_latest_minor_version}-TiDB-${tidb_version}`. +> **Note:** +> +> TiDB nodes use the value of `server-version` to verify the current TiDB version. Therefore, to avoid unexpected behaviors, before upgrading the TiDB cluster, you need to set the value of `server-version` to empty or the real version of the current TiDB cluster. + ### `repair-mode` - Determines whether to enable the untrusted repair mode. When the `repair-mode` is set to `true`, bad tables in the `repair-table-list` cannot be loaded. diff --git a/upgrade-tidb-using-tiup.md b/upgrade-tidb-using-tiup.md index e6c48eaf64693..88b71b54c5d9d 100644 --- a/upgrade-tidb-using-tiup.md +++ b/upgrade-tidb-using-tiup.md @@ -22,7 +22,8 @@ This document is targeted for the following upgrade paths: > **Note:** > -> If your cluster to be upgraded is v3.1 or an earlier version (v3.0 or v2.1), the direct upgrade to v7.2.0 is not supported. You need to upgrade your cluster first to v4.0 and then to v7.2.0. +> - If your cluster to be upgraded is v3.1 or an earlier version (v3.0 or v2.1), the direct upgrade to v7.2.0 is not supported. You need to upgrade your cluster first to v4.0 and then to v7.2.0. +> - TiDB nodes use the value of the [`server-version`](/tidb-configuration-file.md#server-version) configuration item to verify the current TiDB version. Therefore, to avoid unexpected behaviors, before upgrading the TiDB cluster, you need to set the value of `server-version` to empty or the real version of the current TiDB cluster. ## Upgrade caveat