This is an automated cherry-pick of pingcap#15364

Signed-off-by: ti-chi-bot <[email protected]>
ti-chi-bot · Nov 21, 2023 · 87ff134 · 87ff134
1 parent 0e119a6
commit 87ff134
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 2 deletions.
diff --git a/TOC-tidb-cloud.md b/TOC-tidb-cloud.md
@@ -432,9 +432,13 @@
       - [`SHOW ERRORS`](/sql-statements/sql-statement-show-errors.md)
       - [`SHOW [FULL] FIELDS FROM`](/sql-statements/sql-statement-show-fields-from.md)
       - [`SHOW GRANTS`](/sql-statements/sql-statement-show-grants.md)
+<<<<<<< HEAD
       - [`SHOW INDEX [FROM|IN]`](/sql-statements/sql-statement-show-index.md)
       - [`SHOW INDEXES [FROM|IN]`](/sql-statements/sql-statement-show-indexes.md)
       - [`SHOW KEYS [FROM|IN]`](/sql-statements/sql-statement-show-keys.md)
+=======
+      - [`SHOW INDEXES`](/sql-statements/sql-statement-show-indexes.md)
+>>>>>>> eb247c2815 (Remove duplicate docs for SHOW INDEX, SHOW KEYS in favor of SHOW INDEXES (#15364))
       - [`SHOW MASTER STATUS`](/sql-statements/sql-statement-show-master-status.md)
       - [`SHOW PLACEMENT`](/sql-statements/sql-statement-show-placement.md)
       - [`SHOW PLACEMENT FOR`](/sql-statements/sql-statement-show-placement-for.md)

diff --git a/TOC.md b/TOC.md
@@ -812,9 +812,13 @@
       - [`SHOW [FULL] FIELDS FROM`](/sql-statements/sql-statement-show-fields-from.md)
       - [`SHOW GRANTS`](/sql-statements/sql-statement-show-grants.md)
       - [`SHOW IMPORT JOB`](/sql-statements/sql-statement-show-import-job.md)
+<<<<<<< HEAD
       - [`SHOW INDEX [FROM|IN]`](/sql-statements/sql-statement-show-index.md)
       - [`SHOW INDEXES [FROM|IN]`](/sql-statements/sql-statement-show-indexes.md)
       - [`SHOW KEYS [FROM|IN]`](/sql-statements/sql-statement-show-keys.md)
+=======
+      - [`SHOW INDEXES`](/sql-statements/sql-statement-show-indexes.md)
+>>>>>>> eb247c2815 (Remove duplicate docs for SHOW INDEX, SHOW KEYS in favor of SHOW INDEXES (#15364))
       - [`SHOW MASTER STATUS`](/sql-statements/sql-statement-show-master-status.md)
       - [`SHOW PLACEMENT`](/sql-statements/sql-statement-show-placement.md)
       - [`SHOW PLACEMENT FOR`](/sql-statements/sql-statement-show-placement-for.md)

diff --git a/sql-statements/sql-statement-drop-index.md b/sql-statements/sql-statement-drop-index.md
@@ -62,7 +62,7 @@ Query OK, 0 rows affected (0.30 sec)
 
 ## See also
 
-* [SHOW INDEX](/sql-statements/sql-statement-show-index.md)
+* [SHOW INDEXES](/sql-statements/sql-statement-show-indexes.md)
 * [CREATE INDEX](/sql-statements/sql-statement-create-index.md)
 * [ADD INDEX](/sql-statements/sql-statement-add-index.md)
 * [RENAME INDEX](/sql-statements/sql-statement-rename-index.md)

diff --git a/sql-statements/sql-statement-rename-index.md b/sql-statements/sql-statement-rename-index.md
@@ -58,5 +58,5 @@ The `RENAME INDEX` statement in TiDB is fully compatible with MySQL. If you find
 * [SHOW CREATE TABLE](/sql-statements/sql-statement-show-create-table.md)
 * [CREATE INDEX](/sql-statements/sql-statement-create-index.md)
 * [DROP INDEX](/sql-statements/sql-statement-drop-index.md)
-* [SHOW INDEX](/sql-statements/sql-statement-show-index.md)
+* [SHOW INDEXES](/sql-statements/sql-statement-show-indexes.md)
 * [ALTER INDEX](/sql-statements/sql-statement-alter-index.md)
diff --git a/sql-statements/sql-statement-show-indexes.md b/sql-statements/sql-statement-show-indexes.md
@@ -1,6 +1,10 @@
 ---
 title: SHOW INDEXES [FROM|IN] | TiDB SQL Statement Reference
 summary: An overview of the usage of SHOW INDEXES [FROM|IN] for the TiDB database.
+<<<<<<< HEAD
+=======
+aliases: ['/docs/dev/sql-statements/sql-statement-show-indexes/','/docs/dev/reference/sql/statements/show-indexes/', '/tidb/dev/sql-statement-show-index/', '/tidb/dev/sql-statement-show-keys/']
+>>>>>>> eb247c2815 (Remove duplicate docs for SHOW INDEX, SHOW KEYS in favor of SHOW INDEXES (#15364))
 ---
 
 # SHOW INDEXES [FROM|IN]