From 6b889b54d6bb175e550726ba6166e65d10bb712c Mon Sep 17 00:00:00 2001 From: Ti Chi Robot Date: Mon, 14 Aug 2023 15:00:29 +0800 Subject: [PATCH] Remove server version upgrade (#14457) (#14501) --- 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 714e25f83af7c..7bcecef80f66d 100644 --- a/tidb-configuration-file.md +++ b/tidb-configuration-file.md @@ -122,6 +122,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 ec04c3ff742ab..af5c1106055ce 100644 --- a/upgrade-tidb-using-tiup.md +++ b/upgrade-tidb-using-tiup.md @@ -24,7 +24,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 v6.5.0 or a later v6.5.x version is not supported. You need to upgrade your cluster first to v4.0 and then to the target TiDB version. +> - If your cluster to be upgraded is v3.1 or an earlier version (v3.0 or v2.1), the direct upgrade to v6.5.0 or a later v6.5.x version is not supported. You need to upgrade your cluster first to v4.0 and then to the target TiDB version. +> - 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