diff options
| author | Rucha Deodhar <rucha.deodhar@mariadb.com> | 2021-02-15 01:39:37 +0530 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2021-05-19 06:48:36 +0200 |
| commit | 2fdb556e045e9918410086eeaac5a94a4c028626 (patch) | |
| tree | 1420013b4e76b3192cb8ac33406c818d3ecfc3af /mysql-test/suite/sys_vars/r/character_set_client_basic.result | |
| parent | c366845a0b5c08285c958cf1500b3b7906ecf8d4 (diff) | |
| download | mariadb-git-2fdb556e045e9918410086eeaac5a94a4c028626.tar.gz | |
MDEV-8334: Rename utf8 to utf8mb3
This patch changes the main name of 3 byte character set from utf8 to
utf8mb3. New old_mode UTF8_IS_UTF8MB3 is added and set TRUE by default,
so that utf8 would mean utf8mb3. If not set, utf8 would mean utf8mb4.
Diffstat (limited to 'mysql-test/suite/sys_vars/r/character_set_client_basic.result')
| -rw-r--r-- | mysql-test/suite/sys_vars/r/character_set_client_basic.result | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/mysql-test/suite/sys_vars/r/character_set_client_basic.result b/mysql-test/suite/sys_vars/r/character_set_client_basic.result index 1464c35cc20..a15e1d10b79 100644 --- a/mysql-test/suite/sys_vars/r/character_set_client_basic.result +++ b/mysql-test/suite/sys_vars/r/character_set_client_basic.result @@ -18,7 +18,7 @@ ERROR 42S22: Unknown column 'character_set_client' in 'field list' SET character_set_client=utf8; SELECT @@session.character_set_client; @@session.character_set_client -utf8 +utf8mb3 SET session character_set_client=utf8; SELECT session character_set_client; ERROR 42S22: Unknown column 'session' in 'field list' @@ -40,14 +40,14 @@ SELECT @@global.character_set_client= @global_start_value; SET @@session.character_set_client = utf8; SELECT @@session.character_set_client; @@session.character_set_client -utf8 +utf8mb3 SET @@global.character_set_client = latin2; SELECT @@global.character_set_client; @@global.character_set_client latin2 SELECT @@session.character_set_client AS res_is_utf8; res_is_utf8 -utf8 +utf8mb3 SET @@session.character_set_client = latin5; SELECT @@session.character_set_client; @@session.character_set_client @@ -157,7 +157,7 @@ armscii8 SET @@character_set_client = utf8; SELECT @@character_set_client; @@character_set_client -utf8 +utf8mb3 SET @@character_set_client = utf8mb4; SELECT @@character_set_client; @@character_set_client @@ -308,11 +308,11 @@ armscii8 SET @@global.character_set_client = utf8; SELECT @@global.character_set_client; @@global.character_set_client -utf8 +utf8mb3 SET @@global.character_set_client = ucs2; SELECT @@global.character_set_client; @@global.character_set_client -utf8 +utf8mb3 SET @@global.character_set_client = cp866; SELECT @@global.character_set_client; @@global.character_set_client @@ -369,15 +369,15 @@ eucjpms SET @@character_set_client = UTF8; SELECT @@character_set_client; @@character_set_client -utf8 +utf8mb3 SET @@character_set_client = utf8; SELECT @@character_set_client; @@character_set_client -utf8 +utf8mb3 SET @@global.character_set_client = uTf8; SELECT @@global.character_set_client; @@global.character_set_client -utf8 +utf8mb3 '#--------------------FN_DYNVARS_010_09-------------------------#' SET @@character_set_client = 1; SELECT @@character_set_client; |