mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
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.
This commit is contained in:
Rucha Deodhar
committed by
Oleksandr Byelkin
Oleksandr Byelkin
parent
c366845a0b
commit
2fdb556e04
@@ -21,7 +21,7 @@ ERROR 42S22: Unknown column 'collation_database' in 'field list'
|
||||
SET collation_database=utf8_unicode_ci;
|
||||
SELECT @@session.collation_database;
|
||||
@@session.collation_database
|
||||
utf8_unicode_ci
|
||||
utf8mb3_unicode_ci
|
||||
SET session collation_database=utf8_unicode_ci;
|
||||
SELECT session collation_database;
|
||||
ERROR 42S22: Unknown column 'session' in 'field list'
|
||||
@@ -47,14 +47,14 @@ length(@@global.collation_database) > 0
|
||||
SET @@session.collation_database = utf8_polish_ci;
|
||||
SELECT @@session.collation_database;
|
||||
@@session.collation_database
|
||||
utf8_polish_ci
|
||||
utf8mb3_polish_ci
|
||||
SET @@global.collation_database = latin7_general_ci;
|
||||
SELECT @@global.collation_database;
|
||||
@@global.collation_database
|
||||
latin7_general_ci
|
||||
SELECT @@session.collation_database AS res_is_utf8_polish_ci;
|
||||
res_is_utf8_polish_ci
|
||||
utf8_polish_ci
|
||||
utf8mb3_polish_ci
|
||||
SET @@session.collation_database = latin7_bin;
|
||||
SELECT @@session.collation_database;
|
||||
@@session.collation_database
|
||||
@@ -295,91 +295,91 @@ armscii8_bin
|
||||
SET @@session.collation_database = utf8_general_ci;
|
||||
SELECT @@session.collation_database;
|
||||
@@session.collation_database
|
||||
utf8_general_ci
|
||||
utf8mb3_general_ci
|
||||
SET @@session.collation_database = utf8_bin;
|
||||
SELECT @@session.collation_database;
|
||||
@@session.collation_database
|
||||
utf8_bin
|
||||
utf8mb3_bin
|
||||
SET @@session.collation_database = utf8_unicode_ci;
|
||||
SELECT @@session.collation_database;
|
||||
@@session.collation_database
|
||||
utf8_unicode_ci
|
||||
utf8mb3_unicode_ci
|
||||
SET @@session.collation_database = utf8_icelandic_ci;
|
||||
SELECT @@session.collation_database;
|
||||
@@session.collation_database
|
||||
utf8_icelandic_ci
|
||||
utf8mb3_icelandic_ci
|
||||
SET @@session.collation_database = utf8_latvian_ci;
|
||||
SELECT @@session.collation_database;
|
||||
@@session.collation_database
|
||||
utf8_latvian_ci
|
||||
utf8mb3_latvian_ci
|
||||
SET @@session.collation_database = utf8_romanian_ci;
|
||||
SELECT @@session.collation_database;
|
||||
@@session.collation_database
|
||||
utf8_romanian_ci
|
||||
utf8mb3_romanian_ci
|
||||
SET @@session.collation_database = utf8_slovenian_ci;
|
||||
SELECT @@session.collation_database;
|
||||
@@session.collation_database
|
||||
utf8_slovenian_ci
|
||||
utf8mb3_slovenian_ci
|
||||
SET @@session.collation_database = utf8_polish_ci;
|
||||
SELECT @@session.collation_database;
|
||||
@@session.collation_database
|
||||
utf8_polish_ci
|
||||
utf8mb3_polish_ci
|
||||
SET @@session.collation_database = utf8_estonian_ci;
|
||||
SELECT @@session.collation_database;
|
||||
@@session.collation_database
|
||||
utf8_estonian_ci
|
||||
utf8mb3_estonian_ci
|
||||
SET @@session.collation_database = utf8_spanish_ci;
|
||||
SELECT @@session.collation_database;
|
||||
@@session.collation_database
|
||||
utf8_spanish_ci
|
||||
utf8mb3_spanish_ci
|
||||
SET @@session.collation_database = utf8_swedish_ci;
|
||||
SELECT @@session.collation_database;
|
||||
@@session.collation_database
|
||||
utf8_swedish_ci
|
||||
utf8mb3_swedish_ci
|
||||
SET @@session.collation_database = utf8_turkish_ci;
|
||||
SELECT @@session.collation_database;
|
||||
@@session.collation_database
|
||||
utf8_turkish_ci
|
||||
utf8mb3_turkish_ci
|
||||
SET @@session.collation_database = utf8_czech_ci;
|
||||
SELECT @@session.collation_database;
|
||||
@@session.collation_database
|
||||
utf8_czech_ci
|
||||
utf8mb3_czech_ci
|
||||
SET @@session.collation_database = utf8_danish_ci;
|
||||
SELECT @@session.collation_database;
|
||||
@@session.collation_database
|
||||
utf8_danish_ci
|
||||
utf8mb3_danish_ci
|
||||
SET @@session.collation_database = utf8_lithuanian_ci;
|
||||
SELECT @@session.collation_database;
|
||||
@@session.collation_database
|
||||
utf8_lithuanian_ci
|
||||
utf8mb3_lithuanian_ci
|
||||
SET @@session.collation_database = utf8_slovak_ci;
|
||||
SELECT @@session.collation_database;
|
||||
@@session.collation_database
|
||||
utf8_slovak_ci
|
||||
utf8mb3_slovak_ci
|
||||
SET @@session.collation_database = utf8_spanish2_ci;
|
||||
SELECT @@session.collation_database;
|
||||
@@session.collation_database
|
||||
utf8_spanish2_ci
|
||||
utf8mb3_spanish2_ci
|
||||
SET @@session.collation_database = utf8_roman_ci;
|
||||
SELECT @@session.collation_database;
|
||||
@@session.collation_database
|
||||
utf8_roman_ci
|
||||
utf8mb3_roman_ci
|
||||
SET @@session.collation_database = utf8_persian_ci;
|
||||
SELECT @@session.collation_database;
|
||||
@@session.collation_database
|
||||
utf8_persian_ci
|
||||
utf8mb3_persian_ci
|
||||
SET @@session.collation_database = utf8_esperanto_ci;
|
||||
SELECT @@session.collation_database;
|
||||
@@session.collation_database
|
||||
utf8_esperanto_ci
|
||||
utf8mb3_esperanto_ci
|
||||
SET @@session.collation_database = utf8_hungarian_ci;
|
||||
SELECT @@session.collation_database;
|
||||
@@session.collation_database
|
||||
utf8_hungarian_ci
|
||||
utf8mb3_hungarian_ci
|
||||
SET @@session.collation_database = utf8_thai_520_w2;
|
||||
SELECT @@session.collation_database;
|
||||
@@session.collation_database
|
||||
utf8_thai_520_w2
|
||||
utf8mb3_thai_520_w2
|
||||
SET @@session.collation_database = ucs2_general_ci;
|
||||
SELECT @@session.collation_database;
|
||||
@@session.collation_database
|
||||
@@ -808,91 +808,91 @@ armscii8_bin
|
||||
SET @@global.collation_database = utf8_general_ci;
|
||||
SELECT @@global.collation_database;
|
||||
@@global.collation_database
|
||||
utf8_general_ci
|
||||
utf8mb3_general_ci
|
||||
SET @@global.collation_database = utf8_bin;
|
||||
SELECT @@global.collation_database;
|
||||
@@global.collation_database
|
||||
utf8_bin
|
||||
utf8mb3_bin
|
||||
SET @@global.collation_database = utf8_unicode_ci;
|
||||
SELECT @@global.collation_database;
|
||||
@@global.collation_database
|
||||
utf8_unicode_ci
|
||||
utf8mb3_unicode_ci
|
||||
SET @@global.collation_database = utf8_icelandic_ci;
|
||||
SELECT @@global.collation_database;
|
||||
@@global.collation_database
|
||||
utf8_icelandic_ci
|
||||
utf8mb3_icelandic_ci
|
||||
SET @@global.collation_database = utf8_latvian_ci;
|
||||
SELECT @@global.collation_database;
|
||||
@@global.collation_database
|
||||
utf8_latvian_ci
|
||||
utf8mb3_latvian_ci
|
||||
SET @@global.collation_database = utf8_romanian_ci;
|
||||
SELECT @@global.collation_database;
|
||||
@@global.collation_database
|
||||
utf8_romanian_ci
|
||||
utf8mb3_romanian_ci
|
||||
SET @@global.collation_database = utf8_slovenian_ci;
|
||||
SELECT @@global.collation_database;
|
||||
@@global.collation_database
|
||||
utf8_slovenian_ci
|
||||
utf8mb3_slovenian_ci
|
||||
SET @@global.collation_database = utf8_polish_ci;
|
||||
SELECT @@global.collation_database;
|
||||
@@global.collation_database
|
||||
utf8_polish_ci
|
||||
utf8mb3_polish_ci
|
||||
SET @@global.collation_database = utf8_estonian_ci;
|
||||
SELECT @@global.collation_database;
|
||||
@@global.collation_database
|
||||
utf8_estonian_ci
|
||||
utf8mb3_estonian_ci
|
||||
SET @@global.collation_database = utf8_spanish_ci;
|
||||
SELECT @@global.collation_database;
|
||||
@@global.collation_database
|
||||
utf8_spanish_ci
|
||||
utf8mb3_spanish_ci
|
||||
SET @@global.collation_database = utf8_swedish_ci;
|
||||
SELECT @@global.collation_database;
|
||||
@@global.collation_database
|
||||
utf8_swedish_ci
|
||||
utf8mb3_swedish_ci
|
||||
SET @@global.collation_database = utf8_turkish_ci;
|
||||
SELECT @@global.collation_database;
|
||||
@@global.collation_database
|
||||
utf8_turkish_ci
|
||||
utf8mb3_turkish_ci
|
||||
SET @@global.collation_database = utf8_czech_ci;
|
||||
SELECT @@global.collation_database;
|
||||
@@global.collation_database
|
||||
utf8_czech_ci
|
||||
utf8mb3_czech_ci
|
||||
SET @@global.collation_database = utf8_danish_ci;
|
||||
SELECT @@global.collation_database;
|
||||
@@global.collation_database
|
||||
utf8_danish_ci
|
||||
utf8mb3_danish_ci
|
||||
SET @@global.collation_database = utf8_lithuanian_ci;
|
||||
SELECT @@global.collation_database;
|
||||
@@global.collation_database
|
||||
utf8_lithuanian_ci
|
||||
utf8mb3_lithuanian_ci
|
||||
SET @@global.collation_database = utf8_slovak_ci;
|
||||
SELECT @@global.collation_database;
|
||||
@@global.collation_database
|
||||
utf8_slovak_ci
|
||||
utf8mb3_slovak_ci
|
||||
SET @@global.collation_database = utf8_spanish2_ci;
|
||||
SELECT @@global.collation_database;
|
||||
@@global.collation_database
|
||||
utf8_spanish2_ci
|
||||
utf8mb3_spanish2_ci
|
||||
SET @@global.collation_database = utf8_roman_ci;
|
||||
SELECT @@global.collation_database;
|
||||
@@global.collation_database
|
||||
utf8_roman_ci
|
||||
utf8mb3_roman_ci
|
||||
SET @@global.collation_database = utf8_persian_ci;
|
||||
SELECT @@global.collation_database;
|
||||
@@global.collation_database
|
||||
utf8_persian_ci
|
||||
utf8mb3_persian_ci
|
||||
SET @@global.collation_database = utf8_esperanto_ci;
|
||||
SELECT @@global.collation_database;
|
||||
@@global.collation_database
|
||||
utf8_esperanto_ci
|
||||
utf8mb3_esperanto_ci
|
||||
SET @@global.collation_database = utf8_hungarian_ci;
|
||||
SELECT @@global.collation_database;
|
||||
@@global.collation_database
|
||||
utf8_hungarian_ci
|
||||
utf8mb3_hungarian_ci
|
||||
SET @@global.collation_database = utf8_thai_520_w2;
|
||||
SELECT @@global.collation_database;
|
||||
@@global.collation_database
|
||||
utf8_thai_520_w2
|
||||
utf8mb3_thai_520_w2
|
||||
SET @@global.collation_database = ucs2_general_ci;
|
||||
SELECT @@global.collation_database;
|
||||
@@global.collation_database
|
||||
|
||||
Reference in New Issue
Block a user