This is an automated cherry-pick of pingcap#6299

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
ti-chi-bot · Sep 3, 2021 · 2af2505 · 2af2505
1 parent 92bbd7a
commit 2af2505
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 deletions.
diff --git a/system-variables.md b/system-variables.md
@@ -1258,34 +1258,34 @@ SET tidb_slow_log_threshold = 200;
 - Scope: SESSION | GLOBAL
 - Default value: `24`
 - Range: `[0, 255]`
-- This variable is used to set the history capacity of the statement summary.
+- This variable is used to set the history capacity of [statement summary tables](/statement-summary-tables.md).
 
 ### tidb_stmt_summary_internal_query <span class="version-mark">New in v4.0</span>
 
 - Scope: SESSION | GLOBAL
 - Default value: `OFF`
-- This variable is used to control whether to include the SQL information of TiDB in the statement summary.
+- This variable is used to control whether to include the SQL information of TiDB in [statement summary tables](/statement-summary-tables.md).
 
 ### tidb_stmt_summary_max_sql_length <span class="version-mark">New in v4.0</span>
 
 - Scope: SESSION | GLOBAL
 - Default value: `4096`
 - Range: `[0, 2147483647]`
-- This variable is used to control the length of the SQL string in the statement summary.
+- This variable is used to control the length of the SQL string in [statement summary tables](/statement-summary-tables.md).
 
 ### tidb_stmt_summary_max_stmt_count <span class="version-mark">New in v4.0</span>
 
 - Scope: SESSION | GLOBAL
 - Default value: Before v5.1.1, the default value is `200`. Since v5.1.1, the default value is `3000`.
 - Range: `[1, 32767]`
-- This variable is used to set the maximum number of statements that the statement summary stores in memory.
+- This variable is used to set the maximum number of statements that [statement summary tables](/statement-summary-tables.md) store in memory.
 
 ### tidb_stmt_summary_refresh_interval <span class="version-mark">New in v4.0</span>
 
 - Scope: SESSION | GLOBAL
 - Default value: `1800`
 - Range: `[1, 2147483647]`
-- This variable is used to set the refresh time of the statement summary. The unit is second.
+- This variable is used to set the refresh time of [statement summary tables](/statement-summary-tables.md). The unit is second.
 
 ### tidb_store_limit <span class="version-mark">New in v3.0.4 and v4.0</span>
 

diff --git a/tidb-configuration-file.md b/tidb-configuration-file.md
@@ -599,6 +599,7 @@ Configuration related to the status of TiDB service.
 
 ## stmt-summary <span class="version-mark">New in v3.0.4</span>
 
+<<<<<<< HEAD
 Configurations related to the `events_statement_summary_by_digest` table.
 
 ### max-stmt-count
@@ -609,6 +610,18 @@ Configurations related to the `events_statement_summary_by_digest` table.
 ### max-sql-length
 
 - The longest display length for the `DIGEST_TEXT` and `QUERY_SAMPLE_TEXT` columns in the `events_statement_summary_by_digest` table.
+=======
+Configurations related to [statement summary tables](/statement-summary-tables.md).
+
+### max-stmt-count
+
+- The maximum number of SQL categories allowed to be saved in [statement summary tables](/statement-summary-tables.md).
+- Default value: `3000`
+
+### max-sql-length
+
+- The longest display length for the `DIGEST_TEXT` and `QUERY_SAMPLE_TEXT` columns in [statement summary tables](/statement-summary-tables.md).
+>>>>>>> 7f8909a47 (change expressions related to statement summary tables (#6299))
 - Default value: `4096`
 
 ## pessimistic-txn