From f09a06cb562757684101941f8ab5c4bbd7b492d5 Mon Sep 17 00:00:00 2001 From: shichun-0415 <89768198+shichun-0415@users.noreply.github.com> Date: Tue, 14 Sep 2021 17:54:41 +0800 Subject: [PATCH 1/3] This is an automated cherry-pick of #6434 Signed-off-by: ti-chi-bot --- sql-statements/sql-statement-create-index.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sql-statements/sql-statement-create-index.md b/sql-statements/sql-statement-create-index.md index 1a46eda213339..fb276a376c0b3 100644 --- a/sql-statements/sql-statement-create-index.md +++ b/sql-statements/sql-statement-create-index.md @@ -152,9 +152,13 @@ CREATE UNIQUE INDEX c1 ON t1 (c1) INVISIBLE; For details, see [`ALTER INDEX`](/sql-statements/sql-statement-alter-index.md). -## Associated session variables +## Associated system variables +<<<<<<< HEAD The global variables associated with the `CREATE INDEX` statement are `tidb_ddl_reorg_worker_cnt`, `tidb_ddl_reorg_batch_size` and `tidb_ddl_reorg_priority`. Refer to [system variables](/system-variables.md#tidb_ddl_reorg_worker_cnt) for details. +======= +The system variables associated with the `CREATE INDEX` statement are `tidb_ddl_reorg_worker_cnt`, `tidb_ddl_reorg_batch_size`, `tidb_enable_auto_increment_in_generated`, and `tidb_ddl_reorg_priority`. Refer to [system variables](/system-variables.md#tidb_ddl_reorg_worker_cnt) for details. +>>>>>>> 4167cb44a (Update the related variable description for CREATE INDEX (#6434)) ## MySQL compatibility From 88116d72997fb1eb2bf4228e2adf654ce9b3486f Mon Sep 17 00:00:00 2001 From: shichun-0415 Date: Tue, 14 Sep 2021 19:31:20 +0800 Subject: [PATCH 2/3] Update sql-statement-create-index.md --- sql-statements/sql-statement-create-index.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sql-statements/sql-statement-create-index.md b/sql-statements/sql-statement-create-index.md index fb276a376c0b3..d70541d06a07c 100644 --- a/sql-statements/sql-statement-create-index.md +++ b/sql-statements/sql-statement-create-index.md @@ -154,11 +154,7 @@ For details, see [`ALTER INDEX`](/sql-statements/sql-statement-alter-index.md). ## Associated system variables -<<<<<<< HEAD -The global variables associated with the `CREATE INDEX` statement are `tidb_ddl_reorg_worker_cnt`, `tidb_ddl_reorg_batch_size` and `tidb_ddl_reorg_priority`. Refer to [system variables](/system-variables.md#tidb_ddl_reorg_worker_cnt) for details. -======= The system variables associated with the `CREATE INDEX` statement are `tidb_ddl_reorg_worker_cnt`, `tidb_ddl_reorg_batch_size`, `tidb_enable_auto_increment_in_generated`, and `tidb_ddl_reorg_priority`. Refer to [system variables](/system-variables.md#tidb_ddl_reorg_worker_cnt) for details. ->>>>>>> 4167cb44a (Update the related variable description for CREATE INDEX (#6434)) ## MySQL compatibility From 9349499da7417078819682a583038a139f2562fe Mon Sep 17 00:00:00 2001 From: shichun-0415 Date: Tue, 14 Sep 2021 19:55:42 +0800 Subject: [PATCH 3/3] Update sql-statement-create-index.md --- sql-statements/sql-statement-create-index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sql-statements/sql-statement-create-index.md b/sql-statements/sql-statement-create-index.md index d70541d06a07c..979ffd815805d 100644 --- a/sql-statements/sql-statement-create-index.md +++ b/sql-statements/sql-statement-create-index.md @@ -154,7 +154,7 @@ For details, see [`ALTER INDEX`](/sql-statements/sql-statement-alter-index.md). ## Associated system variables -The system variables associated with the `CREATE INDEX` statement are `tidb_ddl_reorg_worker_cnt`, `tidb_ddl_reorg_batch_size`, `tidb_enable_auto_increment_in_generated`, and `tidb_ddl_reorg_priority`. Refer to [system variables](/system-variables.md#tidb_ddl_reorg_worker_cnt) for details. +The system variables associated with the `CREATE INDEX` statement are `tidb_ddl_reorg_worker_cnt`, `tidb_ddl_reorg_batch_size`, and `tidb_ddl_reorg_priority`. Refer to [system variables](/system-variables.md#tidb_ddl_reorg_worker_cnt) for details. ## MySQL compatibility