This is an automated cherry-pick of pingcap#6021

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
ti-chi-bot · Jul 23, 2021 · 967ffe5 · 967ffe5
1 parent 64067d8
commit 967ffe5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/sql-statements/sql-statement-show-variables.md b/sql-statements/sql-statement-show-variables.md
@@ -129,7 +129,7 @@ mysql> SHOW GLOBAL VARIABLES LIKE 'tidb%';
 | tidb_stmt_summary_history_size      | 24                  |
 | tidb_stmt_summary_internal_query    | 0                   |
 | tidb_stmt_summary_max_sql_length    | 4096                |
-| tidb_stmt_summary_max_stmt_count    | 200                 |
+| tidb_stmt_summary_max_stmt_count    | 3000                |
 | tidb_stmt_summary_refresh_interval  | 1800                |
 | tidb_store_limit                    | 0                   |
 | tidb_txn_mode                       |                     |

diff --git a/statement-summary-tables.md b/statement-summary-tables.md
@@ -101,7 +101,7 @@ The following system variables are used to control the statement summary:
 - `tidb_enable_stmt_summary`: Determines whether to enable the statement summary feature. `1` represents `enable`, and `0` means `disable`. The feature is enabled by default. The statistics in the system table are cleared if this feature is disabled. The statistics are re-calculated next time this feature is enabled. Tests have shown that enabling this feature has little impact on performance.
 - `tidb_stmt_summary_refresh_interval`: The interval at which the `statements_summary` table is refreshed. The time unit is second (s). The default value is `1800`.
 - `tidb_stmt_summary_history_size`: The size of each SQL statement category stored in the `statements_summary_history` table. The default value is `24`.
-- `tidb_stmt_summary_max_stmt_count`: Limits the number of SQL statements that can be stored in statement summary tables. The default value is `200`. If the limit is exceeded, those SQL statements that recently remain unused are cleared.
+- `tidb_stmt_summary_max_stmt_count`: Limits the number of SQL statements that can be stored in statement summary tables. Before v4.0.14, the default value is `200`. Since v4.0.14, the default value is `3000`. If the limit is exceeded, those SQL statements that recently remain unused are cleared.
 - `tidb_stmt_summary_max_sql_length`: Specifies the longest display length of `DIGEST_TEXT` and `QUERY_SAMPLE_TEXT`. The default value is `4096`.
 - `tidb_stmt_summary_internal_query`: Determines whether to count the TiDB SQL statements. `1` means to count, and `0` means not to count. The default value is `0`.
 

diff --git a/system-variables.md b/system-variables.md
@@ -1204,8 +1204,12 @@ SET tidb_slow_log_threshold = 200;
 ### tidb_stmt_summary_max_stmt_count <span class="version-mark">New in v4.0</span>
 
 - Scope: SESSION | GLOBAL
+<<<<<<< HEAD
 - Default value: `200`
 - Range: `[1, 32767]`
+=======
+- Default value: Before v4.0.14, the default value is 200. Since v4.0.14, the default value is 3000 (the value of the default configuration file).
+>>>>>>> 53b1093d6 (Update the default value of tidb_stmt_summary_max_stmt_count (#6021))
 - This variable is used to set the maximum number of statements that the statement summary stores in memory.
 
 ### tidb_stmt_summary_refresh_interval <span class="version-mark">New in v4.0</span>