This is an automated cherry-pick of pingcap#13367

Signed-off-by: ti-chi-bot <[email protected]>
ti-chi-bot · Mar 10, 2023 · 103b10f · 103b10f
1 parent 9999179
commit 103b10f
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/TOC.md b/TOC.md
@@ -372,6 +372,11 @@
       - [`KILL [TIDB]`](/sql-statements/sql-statement-kill.md)
       - [`LOAD DATA`](/sql-statements/sql-statement-load-data.md)
       - [`LOAD STATS`](/sql-statements/sql-statement-load-stats.md)
+<<<<<<< HEAD
+=======
+      - [`LOCK STATS`](/sql-statements/sql-statement-lock-stats.md)
+      - [`LOCK TABLES` 和 `UNLOCK TABLES`](/sql-statements/sql-statement-lock-tables-and-unlock-tables.md)
+>>>>>>> 15c2f8605 (Correct the location of table lock in TOC (#13367))
       - [`MODIFY COLUMN`](/sql-statements/sql-statement-modify-column.md)
       - [`PREPARE`](/sql-statements/sql-statement-prepare.md)
       - [`RECOVER TABLE`](/sql-statements/sql-statement-recover-table.md)