Skip to content

Remove server version upgrade (#14569) #14675

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ti-chi-bot merged 2 commits into from
Aug 2, 2023
Merged

Remove server version upgrade (#14569) #14675

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f6f1dec
This is an automated cherry-pick of #14569
Benjamin2037 Aug 2, 2023
cc76d66
Update upgrade-tidb-using-tiup.md
ran-huang Aug 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions tidb-configuration-file.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,10 @@ TiDB 配置文件比命令行参数支持更多的选项。你可以在 [config/
+ 默认值：""
+ 默认情况下，TiDB 版本号格式为：`5.7.${mysql_latest_minor_version}-TiDB-${tidb_version}`。

> **注意：**
>
> `server-version` 的值会被 TiDB 节点用于验证当前 TiDB 的版本。因此在进行 TiDB 集群升级前，请将 `server-version` 的值设置为空或者当前 TiDB 真实的版本值，避免出现非预期行为。

### `repair-mode`

+ 用于开启非可信修复模式，启动该模式后，可以过滤 `repair-table-list` 名单中坏表的加载。
Expand Down
5 changes: 5 additions & 0 deletions upgrade-tidb-using-tiup.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,12 @@ title: 使用 TiUP 升级 TiDB

> **注意：**
>
<<<<<<< HEAD
> 如果原集群是 3.0 或 3.1 或更早的版本，不支持直接升级到 v7.1.0 及后续修订版本。你需要先从早期版本升级到 4.0 后，再从 4.0 升级到 v7.1.0 及后续修订版本。
=======
> 如果原集群是 3.0 或 3.1 或更早的版本，不支持直接升级到 v7.2.0 及后续修订版本。你需要先从早期版本升级到 4.0 后，再从 4.0 升级到 v7.2.0 及后续修订版本。
> 配置参数 [`server-version`](/tidb-configuration-file.md#server-version) 的值会被 TiDB 节点用于验证当前 TiDB 的版本。因此在进行 TiDB 集群升级前，请将 `server-version` 的值设置为空或者当前 TiDB 真实的版本值，避免出现非预期行为。
>>>>>>> a58f9a1166 (Remove server version upgrade (#14569))
Comment thread
ran-huang marked this conversation as resolved.
Outdated

## 1. 升级兼容性说明

Expand Down