From 0c544736d84d028b737e352e7b37dfc275404baa Mon Sep 17 00:00:00 2001 From: djshow832 Date: Wed, 10 Nov 2021 17:55:05 +0800 Subject: [PATCH 1/2] This is an automated cherry-pick of #6775 Signed-off-by: ti-chi-bot --- system-variables.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/system-variables.md b/system-variables.md index da0d7f916ab11..1116f2f44d45b 100644 --- a/system-variables.md +++ b/system-variables.md @@ -1516,6 +1516,7 @@ SET tidb_slow_log_threshold = 200; - Default value: "" - A non-empty value of this variable indicates the UNIX epoch that is used as the timestamp for `CURRENT_TIMESTAMP()`, `NOW()`, and other functions. This variable might be used in data restore or replication. +<<<<<<< HEAD ### tmp_table_size - Scope: SESSION | GLOBAL @@ -1523,6 +1524,8 @@ SET tidb_slow_log_threshold = 200; - Unit: Bytes - Indicates the maximum size of a temporary table. +======= +>>>>>>> 45d81d496 (system-variable.md: remove tmp_table_size (#6775)) ### transaction_isolation - Scope: SESSION | GLOBAL From 6089433414cb62b2a50086c6ca35eb1780cb048b Mon Sep 17 00:00:00 2001 From: TomShawn <41534398+TomShawn@users.noreply.github.com> Date: Wed, 10 Nov 2021 17:57:58 +0800 Subject: [PATCH 2/2] Update system-variables.md --- system-variables.md | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/system-variables.md b/system-variables.md index 1116f2f44d45b..4e15e64e00e64 100644 --- a/system-variables.md +++ b/system-variables.md @@ -1516,16 +1516,6 @@ SET tidb_slow_log_threshold = 200; - Default value: "" - A non-empty value of this variable indicates the UNIX epoch that is used as the timestamp for `CURRENT_TIMESTAMP()`, `NOW()`, and other functions. This variable might be used in data restore or replication. -<<<<<<< HEAD -### tmp_table_size - -- Scope: SESSION | GLOBAL -- Default value: `16777216` -- Unit: Bytes -- Indicates the maximum size of a temporary table. - -======= ->>>>>>> 45d81d496 (system-variable.md: remove tmp_table_size (#6775)) ### transaction_isolation - Scope: SESSION | GLOBAL