From 819164b29b44ab9097de50b5aa2759c6082fd942 Mon Sep 17 00:00:00 2001 From: Morgan Tocker Date: Tue, 29 Jun 2021 01:57:25 -0600 Subject: [PATCH 1/2] This is an automated cherry-pick of #5761 Signed-off-by: ti-chi-bot --- system-variables.md | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/system-variables.md b/system-variables.md index 493fc3c363617..30fa3c5f7e084 100644 --- a/system-variables.md +++ b/system-variables.md @@ -42,6 +42,13 @@ SET GLOBAL tidb_distsql_scan_concurrency = 10; - Default value: 0 - Determines whether to allow explicitly specifying the values of the column with the `AUTO_RANDOM` attribute in the `INSERT` statement. `1` means to allow and `0` means to disallow. +### datadir + +- Scope: NONE +- Default value: /tmp/tidb +- This variable indicates the location where data is stored. This location can be a local path or point to a PD server if the data is stored on TiKV. +- A value in the format of `ip_address:port` indicates the PD server that TiDB connects to on startup. + ### ddl_slow_threshold - Scope: INSTANCE @@ -78,6 +85,21 @@ SET GLOBAL tidb_distsql_scan_concurrency = 10; - Default value: 0 - This variable is used to show whether the execution plan used in the previous statement was influenced by a [plan binding](/sql-plan-management.md) +<<<<<<< HEAD +======= +### last_plan_from_cache New in v4.0 + +- Scope: SESSION +- Default value: `OFF` +- This variable is used to show whether the execution plan used in the previous `execute` statement is taken directly from the plan cache. + +### license + +- Scope: NONE +- Default value: Apache License 2.0 +- This variable indicates the license of your TiDB server installation. + +>>>>>>> 7253ade52 (system-variables: add datadir and license (#5761)) ### max_execution_time - Scope: SESSION | GLOBAL From 8244b3533ab550b1878181a17cb9ea59aff8b0f0 Mon Sep 17 00:00:00 2001 From: Morgan Tocker Date: Mon, 5 Jul 2021 09:18:42 -0600 Subject: [PATCH 2/2] Update system-variables.md --- system-variables.md | 9 --------- 1 file changed, 9 deletions(-) diff --git a/system-variables.md b/system-variables.md index 30fa3c5f7e084..3e3d830e8d255 100644 --- a/system-variables.md +++ b/system-variables.md @@ -85,21 +85,12 @@ SET GLOBAL tidb_distsql_scan_concurrency = 10; - Default value: 0 - This variable is used to show whether the execution plan used in the previous statement was influenced by a [plan binding](/sql-plan-management.md) -<<<<<<< HEAD -======= -### last_plan_from_cache New in v4.0 - -- Scope: SESSION -- Default value: `OFF` -- This variable is used to show whether the execution plan used in the previous `execute` statement is taken directly from the plan cache. - ### license - Scope: NONE - Default value: Apache License 2.0 - This variable indicates the license of your TiDB server installation. ->>>>>>> 7253ade52 (system-variables: add datadir and license (#5761)) ### max_execution_time - Scope: SESSION | GLOBAL