Merge branch 'release-4.0' into pr/6464

pingcap · Sep 14, 2021 · abd6883 · abd6883
2 parents 8f91386 + 3ac687f
commit abd6883
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/sql-statements/sql-statement-create-index.md b/sql-statements/sql-statement-create-index.md
@@ -144,11 +144,7 @@ Currently, the optimizer can use the indexed expressions when the expressions ar
 
 ## 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))
+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