From 8e23d2055f72bae02f55da11c869627469fa088b Mon Sep 17 00:00:00 2001 From: HOHO <591310381@qq.com> Date: Thu, 11 Jan 2024 18:46:13 +0800 Subject: [PATCH 01/10] Update sql-statement-kill.md --- sql-statements/sql-statement-kill.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sql-statements/sql-statement-kill.md b/sql-statements/sql-statement-kill.md index 4481bf1464ab2..e69124ed95abb 100644 --- a/sql-statements/sql-statement-kill.md +++ b/sql-statements/sql-statement-kill.md @@ -7,6 +7,10 @@ summary: An overview of the usage of KILL for the TiDB database. The `KILL` statement is used to terminate a connection in any TiDB instance in the current TiDB cluster. +> **Note:** +> +> Starting from TiDB v6.2.0, `KILL` statement can kill DDL jobs. + ## Synopsis ```ebnf+diagram From 9c5f95f849ed7acd89716cb8c6e89659bca2b88a Mon Sep 17 00:00:00 2001 From: HOHO <591310381@qq.com> Date: Thu, 11 Jan 2024 18:50:50 +0800 Subject: [PATCH 02/10] Update sql-statement-admin-cancel-ddl.md --- sql-statements/sql-statement-admin-cancel-ddl.md | 1 + 1 file changed, 1 insertion(+) diff --git a/sql-statements/sql-statement-admin-cancel-ddl.md b/sql-statements/sql-statement-admin-cancel-ddl.md index fe95d83092080..0e15bad8e197e 100644 --- a/sql-statements/sql-statement-admin-cancel-ddl.md +++ b/sql-statements/sql-statement-admin-cancel-ddl.md @@ -37,6 +37,7 @@ If the operation fails to cancel the jobs, specific reasons are displayed. > - Only this operation can cancel DDL jobs. All other operations and environment changes (such as machine restart and cluster restart) cannot cancel these jobs. > - This operation can cancel multiple DDL jobs at the same time. You can get the ID of DDL jobs using the [`ADMIN SHOW DDL JOBS`](/sql-statements/sql-statement-admin-show-ddl.md) statement. > - If the jobs you want to cancel are finished, the cancellation operation fails. +> - Starting from v6.2.0, [`KILL`](/sql-statements/sql-statement-kill.md) statement can kill DDL jobs. ## MySQL compatibility From a3ad9c22b10d28e74a5672e15ed180b9517d762b Mon Sep 17 00:00:00 2001 From: HOHO <591310381@qq.com> Date: Thu, 11 Jan 2024 19:10:26 +0800 Subject: [PATCH 03/10] Update sql-statements/sql-statement-admin-cancel-ddl.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Daniël van Eeden --- sql-statements/sql-statement-admin-cancel-ddl.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sql-statements/sql-statement-admin-cancel-ddl.md b/sql-statements/sql-statement-admin-cancel-ddl.md index 0e15bad8e197e..1709a37a72009 100644 --- a/sql-statements/sql-statement-admin-cancel-ddl.md +++ b/sql-statements/sql-statement-admin-cancel-ddl.md @@ -37,7 +37,7 @@ If the operation fails to cancel the jobs, specific reasons are displayed. > - Only this operation can cancel DDL jobs. All other operations and environment changes (such as machine restart and cluster restart) cannot cancel these jobs. > - This operation can cancel multiple DDL jobs at the same time. You can get the ID of DDL jobs using the [`ADMIN SHOW DDL JOBS`](/sql-statements/sql-statement-admin-show-ddl.md) statement. > - If the jobs you want to cancel are finished, the cancellation operation fails. -> - Starting from v6.2.0, [`KILL`](/sql-statements/sql-statement-kill.md) statement can kill DDL jobs. +> - Starting from v6.2.0, [`KILL`](/sql-statements/sql-statement-kill.md) statement is able to kill DDL jobs. ## MySQL compatibility From 45cbc5a22d9cd25bb5a751064df41f7aae2c1ed7 Mon Sep 17 00:00:00 2001 From: HOHO <591310381@qq.com> Date: Thu, 11 Jan 2024 19:10:33 +0800 Subject: [PATCH 04/10] Update sql-statements/sql-statement-kill.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Daniël van Eeden --- sql-statements/sql-statement-kill.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sql-statements/sql-statement-kill.md b/sql-statements/sql-statement-kill.md index e69124ed95abb..4f58a77cbb5f1 100644 --- a/sql-statements/sql-statement-kill.md +++ b/sql-statements/sql-statement-kill.md @@ -9,7 +9,7 @@ The `KILL` statement is used to terminate a connection in any TiDB instance in t > **Note:** > -> Starting from TiDB v6.2.0, `KILL` statement can kill DDL jobs. +> Starting from TiDB v6.2.0, `KILL` statement is able to kill DDL jobs. ## Synopsis From 3cf1bd4d8fcfa9d873aaeb066f55340c632349d0 Mon Sep 17 00:00:00 2001 From: HOHO <591310381@qq.com> Date: Sun, 21 Jan 2024 19:37:18 +0800 Subject: [PATCH 05/10] Update sql-statements/sql-statement-admin-cancel-ddl.md Co-authored-by: Grace Cai --- sql-statements/sql-statement-admin-cancel-ddl.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sql-statements/sql-statement-admin-cancel-ddl.md b/sql-statements/sql-statement-admin-cancel-ddl.md index 1709a37a72009..fb8e6e268a942 100644 --- a/sql-statements/sql-statement-admin-cancel-ddl.md +++ b/sql-statements/sql-statement-admin-cancel-ddl.md @@ -34,10 +34,9 @@ If the operation fails to cancel the jobs, specific reasons are displayed. > **Note:** > -> - Only this operation can cancel DDL jobs. All other operations and environment changes (such as machine restart and cluster restart) cannot cancel these jobs. +> - Before v6.2.0, only this operation can cancel DDL jobs, and all other operations and environment changes (such as machine restart and cluster restart) cannot cancel these jobs. Starting from v6.2.0, [`KILL`](/sql-statements/sql-statement-kill.md) statement can also be used to cancel DDL jobs by killing them. > - This operation can cancel multiple DDL jobs at the same time. You can get the ID of DDL jobs using the [`ADMIN SHOW DDL JOBS`](/sql-statements/sql-statement-admin-show-ddl.md) statement. > - If the jobs you want to cancel are finished, the cancellation operation fails. -> - Starting from v6.2.0, [`KILL`](/sql-statements/sql-statement-kill.md) statement is able to kill DDL jobs. ## MySQL compatibility From 593463151a1d04e1b6e0f2338fc7b9144a2e1839 Mon Sep 17 00:00:00 2001 From: HOHO <591310381@qq.com> Date: Sun, 21 Jan 2024 19:38:03 +0800 Subject: [PATCH 06/10] Update sql-statements/sql-statement-kill.md Co-authored-by: Grace Cai --- sql-statements/sql-statement-kill.md | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/sql-statements/sql-statement-kill.md b/sql-statements/sql-statement-kill.md index 4f58a77cbb5f1..41b5d8d8b3423 100644 --- a/sql-statements/sql-statement-kill.md +++ b/sql-statements/sql-statement-kill.md @@ -5,11 +5,7 @@ summary: An overview of the usage of KILL for the TiDB database. # KILL -The `KILL` statement is used to terminate a connection in any TiDB instance in the current TiDB cluster. - -> **Note:** -> -> Starting from TiDB v6.2.0, `KILL` statement is able to kill DDL jobs. +The `KILL` statement is used to terminate a connection in any TiDB instance in the current TiDB cluster. Starting from TiDB v6.2.0, you can also the `KILL` statement to terminate DDL jobs. ## Synopsis From 1b6e50a4900fc38048cc6e45a7f22c0d2c145674 Mon Sep 17 00:00:00 2001 From: HOHO <591310381@qq.com> Date: Tue, 23 Jan 2024 17:09:49 +0800 Subject: [PATCH 07/10] Update sql-statements/sql-statement-admin-cancel-ddl.md Co-authored-by: Grace Cai --- sql-statements/sql-statement-admin-cancel-ddl.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sql-statements/sql-statement-admin-cancel-ddl.md b/sql-statements/sql-statement-admin-cancel-ddl.md index fb8e6e268a942..f85cce4caddb4 100644 --- a/sql-statements/sql-statement-admin-cancel-ddl.md +++ b/sql-statements/sql-statement-admin-cancel-ddl.md @@ -34,7 +34,7 @@ If the operation fails to cancel the jobs, specific reasons are displayed. > **Note:** > -> - Before v6.2.0, only this operation can cancel DDL jobs, and all other operations and environment changes (such as machine restart and cluster restart) cannot cancel these jobs. Starting from v6.2.0, [`KILL`](/sql-statements/sql-statement-kill.md) statement can also be used to cancel DDL jobs by killing them. +> - Before v6.2.0, only this operation can cancel DDL jobs, and all other operations and environment changes (such as machine restart and cluster restart) cannot cancel these jobs. Starting from v6.2.0, [`KILL`](/sql-statements/sql-statement-kill.md) statement can also be used to cancel ongoing DDL jobs by killing them. > - This operation can cancel multiple DDL jobs at the same time. You can get the ID of DDL jobs using the [`ADMIN SHOW DDL JOBS`](/sql-statements/sql-statement-admin-show-ddl.md) statement. > - If the jobs you want to cancel are finished, the cancellation operation fails. From 65130e59e0e13d9eddbdfb968c4e3a4e25c76463 Mon Sep 17 00:00:00 2001 From: HOHO <591310381@qq.com> Date: Tue, 23 Jan 2024 17:10:01 +0800 Subject: [PATCH 08/10] Update sql-statements/sql-statement-kill.md Co-authored-by: Grace Cai --- sql-statements/sql-statement-kill.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sql-statements/sql-statement-kill.md b/sql-statements/sql-statement-kill.md index 41b5d8d8b3423..648f491f370ad 100644 --- a/sql-statements/sql-statement-kill.md +++ b/sql-statements/sql-statement-kill.md @@ -5,7 +5,7 @@ summary: An overview of the usage of KILL for the TiDB database. # KILL -The `KILL` statement is used to terminate a connection in any TiDB instance in the current TiDB cluster. Starting from TiDB v6.2.0, you can also the `KILL` statement to terminate DDL jobs. +The `KILL` statement is used to terminate a connection in any TiDB instance in the current TiDB cluster. Starting from TiDB v6.2.0, you can also the `KILL` statement to terminate ongoing DDL jobs. ## Synopsis From 22d250fde77985ab9b263ff71e07d1d72bf8d1ab Mon Sep 17 00:00:00 2001 From: Grace Cai Date: Wed, 24 Jan 2024 12:22:05 +0800 Subject: [PATCH 09/10] wording updates --- sql-statements/sql-statement-kill.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sql-statements/sql-statement-kill.md b/sql-statements/sql-statement-kill.md index 648f491f370ad..5b16f4166a26e 100644 --- a/sql-statements/sql-statement-kill.md +++ b/sql-statements/sql-statement-kill.md @@ -5,7 +5,7 @@ summary: An overview of the usage of KILL for the TiDB database. # KILL -The `KILL` statement is used to terminate a connection in any TiDB instance in the current TiDB cluster. Starting from TiDB v6.2.0, you can also the `KILL` statement to terminate ongoing DDL jobs. +The `KILL` statement is used to terminate a connection in any TiDB instance in the current TiDB cluster. Starting from TiDB v6.2.0, you can also use the `KILL` statement to terminate ongoing DDL jobs. ## Synopsis From a1530ac2bed313f1ee5f90676bbd7e88df0a27c3 Mon Sep 17 00:00:00 2001 From: HOHO <591310381@qq.com> Date: Fri, 26 Jan 2024 09:04:34 +0800 Subject: [PATCH 10/10] Update sql-statements/sql-statement-admin-cancel-ddl.md Co-authored-by: Ran --- sql-statements/sql-statement-admin-cancel-ddl.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sql-statements/sql-statement-admin-cancel-ddl.md b/sql-statements/sql-statement-admin-cancel-ddl.md index f85cce4caddb4..968b059a8785a 100644 --- a/sql-statements/sql-statement-admin-cancel-ddl.md +++ b/sql-statements/sql-statement-admin-cancel-ddl.md @@ -34,7 +34,7 @@ If the operation fails to cancel the jobs, specific reasons are displayed. > **Note:** > -> - Before v6.2.0, only this operation can cancel DDL jobs, and all other operations and environment changes (such as machine restart and cluster restart) cannot cancel these jobs. Starting from v6.2.0, [`KILL`](/sql-statements/sql-statement-kill.md) statement can also be used to cancel ongoing DDL jobs by killing them. +> - Before v6.2.0, only this operation can cancel DDL jobs, and all other operations and environment changes (such as machine restart and cluster restart) cannot cancel these jobs. Starting from v6.2.0, [`KILL`](/sql-statements/sql-statement-kill.md) statements can also be used to cancel ongoing DDL jobs by killing them. > - This operation can cancel multiple DDL jobs at the same time. You can get the ID of DDL jobs using the [`ADMIN SHOW DDL JOBS`](/sql-statements/sql-statement-admin-show-ddl.md) statement. > - If the jobs you want to cancel are finished, the cancellation operation fails.