From 30bad9d7aa1c01ece90fbfa14cab5712d906485d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20van=20Eeden?= Date: Thu, 1 Jul 2021 13:33:26 +0200 Subject: [PATCH 1/2] This is an automated cherry-pick of #5867 Signed-off-by: ti-chi-bot --- system-variables.md | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/system-variables.md b/system-variables.md index 702db8343a5ad..508c45d1ad48b 100644 --- a/system-variables.md +++ b/system-variables.md @@ -79,6 +79,45 @@ mysql> SELECT * FROM t1; - Default value: ON - Controls whether statements should automatically commit when not in an explicit transaction. See [Transaction Overview](/transaction-overview.md#autocommit) for more information. +<<<<<<< HEAD +======= +### character_set_client + +- Scope: SESSION | GLOBAL +- Default value: `utf8mb4` +- The character set for data sent from the client. See [Character Set and Collation](/character-set-and-collation.md) for details on the use of character sets and collations in TiDB. It is recommended to use [`SET NAMES`](/sql-statements/sql-statement-set-names.md) to change the character set when needed. + +### character_set_connection + +- Scope: SESSION | GLOBAL +- Default value: `utf8mb4` +- The character set for string literals that do not have a specified character set. + +### character_set_database + +- Scope: SESSION | GLOBAL +- Default value: `utf8mb4` +- This variable indicates the character set of the default database in use. **It is NOT recommended to set this variable**. When a new default database is selected, the server changes the variable value. + +### character_set_results + +- Scope: SESSION | GLOBAL +- Default value: `utf8mb4` +- The character set that is used when data is sent to the client. + +### character_set_server + +- Scope: SESSION | GLOBAL +- Default value: `utf8mb4` +- The character set used for new schemas when no character set is specified in the `CREATE SCHEMA` statement. + +### `cte_max_recursion_depth` + +- Scope：SESSION | GLOBAL +- Default value：1000 +- Controls the maximum recursion depth in Common Table Expressions. + +>>>>>>> 79f4f71df (system-variables: Add charset documentation (#5867)) ### datadir - Scope: NONE From bbad9d83caf66acb84a0e04975d15dc1de3b6932 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20van=20Eeden?= Date: Thu, 1 Jul 2021 13:50:24 +0200 Subject: [PATCH 2/2] fix conflict --- system-variables.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/system-variables.md b/system-variables.md index 508c45d1ad48b..b8bc990fd44f7 100644 --- a/system-variables.md +++ b/system-variables.md @@ -79,8 +79,6 @@ mysql> SELECT * FROM t1; - Default value: ON - Controls whether statements should automatically commit when not in an explicit transaction. See [Transaction Overview](/transaction-overview.md#autocommit) for more information. -<<<<<<< HEAD -======= ### character_set_client - Scope: SESSION | GLOBAL @@ -117,7 +115,6 @@ mysql> SELECT * FROM t1; - Default value：1000 - Controls the maximum recursion depth in Common Table Expressions. ->>>>>>> 79f4f71df (system-variables: Add charset documentation (#5867)) ### datadir - Scope: NONE