From 89e21de355ca27f222e4c092d4cdab0e32708b48 Mon Sep 17 00:00:00 2001 From: xixirangrang Date: Thu, 11 Jul 2024 16:49:34 +0800 Subject: [PATCH 1/2] This is an automated cherry-pick of #17915 Signed-off-by: ti-chi-bot --- TOC.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/TOC.md b/TOC.md index 19726f0eafbf..df0f9b7cdf05 100644 --- a/TOC.md +++ b/TOC.md @@ -405,7 +405,11 @@ - [`SHOW MASTER STATUS`](/sql-statements/sql-statement-show-master-status.md) - [`SHOW PLUGINS`](/sql-statements/sql-statement-show-plugins.md) - [`SHOW PRIVILEGES`](/sql-statements/sql-statement-show-privileges.md) +<<<<<<< HEAD - [`SHOW [FULL] PROCESSSLIST`](/sql-statements/sql-statement-show-processlist.md) +======= + - [`SHOW PROCESSLIST`](/sql-statements/sql-statement-show-processlist.md) +>>>>>>> 5a75d4829a (*: fix a typo in toc (#17915)) - [`SHOW PROFILES`](/sql-statements/sql-statement-show-profiles.md) - [`SHOW PUMP STATUS`](/sql-statements/sql-statement-show-pump-status.md) - [`SHOW SCHEMAS`](/sql-statements/sql-statement-show-schemas.md) From 64967f74b090c8ed486f53ae26ce699df743b5bc Mon Sep 17 00:00:00 2001 From: xixirangrang Date: Thu, 11 Jul 2024 17:07:45 +0800 Subject: [PATCH 2/2] Update TOC.md --- TOC.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/TOC.md b/TOC.md index df0f9b7cdf05..7805bb671d22 100644 --- a/TOC.md +++ b/TOC.md @@ -405,11 +405,7 @@ - [`SHOW MASTER STATUS`](/sql-statements/sql-statement-show-master-status.md) - [`SHOW PLUGINS`](/sql-statements/sql-statement-show-plugins.md) - [`SHOW PRIVILEGES`](/sql-statements/sql-statement-show-privileges.md) -<<<<<<< HEAD - - [`SHOW [FULL] PROCESSSLIST`](/sql-statements/sql-statement-show-processlist.md) -======= - [`SHOW PROCESSLIST`](/sql-statements/sql-statement-show-processlist.md) ->>>>>>> 5a75d4829a (*: fix a typo in toc (#17915)) - [`SHOW PROFILES`](/sql-statements/sql-statement-show-profiles.md) - [`SHOW PUMP STATUS`](/sql-statements/sql-statement-show-pump-status.md) - [`SHOW SCHEMAS`](/sql-statements/sql-statement-show-schemas.md)