Skip to content
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.

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

增加kill语句取消ddl作业的描述 (#16159) #16280

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion sql-statements/sql-statement-admin-cancel-ddl.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ ADMIN CANCEL DDL JOBS job_id [, job_id] ...;

> **注意:**
>
> + 只有该操作可以取消 DDL 作业,其他所有的操作和环境变更(例如机器重启、集群重启)都不会取消 DDL 作业。
> + 在 v6.2.0 之前,只有该操作可以取消 DDL 作业,其他所有的操作和环境变更(例如机器重启、集群重启)都不会取消 DDL 作业。从 v6.2.0 开始,使用 [`KILL`](/sql-statements/sql-statement-kill.md) 语句终止作业的方式也可以取消正在执行中的 DDL 作业。
> + 该操作可以同时取消多个 DDL 作业,可以通过 [`ADMIN SHOW DDL JOBS`](/sql-statements/sql-statement-admin-show-ddl.md) 语句来获取 DDL 作业的 `job_id`。
> + 如果希望取消的作业已经执行完毕,取消操作将失败。

Expand Down
4 changes: 2 additions & 2 deletions sql-statements/sql-statement-kill.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ summary: TiDB 数据库中 KILL 的使用概况。

# KILL

`KILL` 语句可以终止当前 TiDB 集群中任意一个 TiDB 实例中的某个连接。
`KILL` 语句可以终止当前 TiDB 集群中任意一个 TiDB 实例中的某个连接,从 v6.2.0 开始,`KILL` 语句也可以终止正在执行中的 DDL 作业

## 语法图

Expand Down Expand Up @@ -67,4 +67,4 @@ TiDB 从 v6.1.0 起新增 Global Kill 功能(由 [`enable-global-kill`](/tidb-
## 另请参阅

- [SHOW \[FULL\] PROCESSLIST](/sql-statements/sql-statement-show-processlist.md)
- [CLUSTER_PROCESSLIST](/information-schema/information-schema-processlist.md#cluster_processlist)
- [CLUSTER_PROCESSLIST](/information-schema/information-schema-processlist.md#cluster_processlist)