diff --git a/mysql-test/include/ctype_regex.inc b/mysql-test/include/ctype_regex.inc index 2c8c9b4be21..6219b5e3395 100644 --- a/mysql-test/include/ctype_regex.inc +++ b/mysql-test/include/ctype_regex.inc @@ -3,6 +3,11 @@ # this collation before including this file # + +--echo # +--echo # Bug#31081 server crash in regexp function +--echo # + --disable_warnings drop table if exists t1; --enable_warnings diff --git a/mysql-test/include/ctype_regex_utf8.inc b/mysql-test/include/ctype_regex_utf8.inc index d389cb214f7..77ed07f8c85 100644 --- a/mysql-test/include/ctype_regex_utf8.inc +++ b/mysql-test/include/ctype_regex_utf8.inc @@ -1,9 +1,9 @@ -# -# Bug #3928 regexp [[:>:]] and UTF-8 -# +--echo # +--echo # Bug #3928 regexp [[:>:]] and UTF-8 +--echo # SELECT @@character_set_client, @@collation_connection; -# This should return TRUE +--echo # This should return TRUE select 'вася' rlike '\\bвася\\b'; select 'вася ' rlike '\\bвася\\b'; select ' вася' rlike '\\bвася\\b'; @@ -14,7 +14,7 @@ select 'вася ' rlike '[[:<:]]вася[[:>:]]'; select ' вася' rlike '[[:<:]]вася[[:>:]]'; select ' вася ' rlike '[[:<:]]вася[[:>:]]'; -# This should return FALSE +--echo # This should return FALSE select 'васяz' rlike '\\bвася\\b'; select 'zвася' rlike '\\bвася\\b'; select 'zвасяz' rlike '\\bвася\\b'; diff --git a/mysql-test/include/ctype_special_chars.inc b/mysql-test/include/ctype_special_chars.inc new file mode 100644 index 00000000000..2b56a8ecbe8 --- /dev/null +++ b/mysql-test/include/ctype_special_chars.inc @@ -0,0 +1,71 @@ +# +# Various tests with blank and control characters +# + +# Tests covering a change in mysql-5.5.37: +# +# commit 63e1d22f8f46966c13d88a4f2e9acd7fa3e9c9b6 +# Date: Fri Mar 26 18:14:39 2004 +0400 +# +# UTF8 now process space as PAD character correctly. + +--disable_service_connection + +SELECT COLLATION('a'); + +SELECT 'a' = 'a ' AS c; +SELECT 'a\0' = 'a' AS c; +SELECT 'a\0' = 'a ' AS c; +SELECT 'a\t' = 'a' AS c; +SELECT 'a\t' = 'a ' AS c; + +SELECT 'a' < 'a ' AS c; +SELECT 'a\0' < 'a' AS c; +SELECT 'a\0' < 'a ' AS c; +SELECT 'a\t' < 'a' AS c; +SELECT 'a\t' < 'a ' AS c; + +SELECT 'a' > 'a ' AS c; +SELECT 'a\0' > 'a' AS c; +SELECT 'a\0' > 'a ' AS c; +SELECT 'a\t' > 'a' AS c; +SELECT 'a\t' > 'a ' AS c; + +--enable_service_connection + +CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS a LIMIT 0; + +# +# Add a column `a_readable` returning a readable form of 'a' +# Some special characters get replaces to dots: +# - 0x00 - to make "diff" handle the output as text rather than binary +# - 0x09 - to the the output have a more predictable visible width +# +# It's important for `a_readable` to have exactly +# the same character set with `a`, to avoid data loss on conversion. +# Let's also create it with the same collation with `a`, just in case. + +EXECUTE IMMEDIATE + REPLACE(REPLACE( + "ALTER TABLE t1 ADD a_readable " + "TEXT CHARACTER SET latin1 COLLATE DEFAULT " + "GENERATED ALWAYS AS " + "(RPAD(QUOTE(REGEXP_REPLACE(t1.a, '(\\\\x{00}|\\\\x{09})', '.')), 10))", + 'DEFAULT', collation('a')), + 'latin1', charset('a')); + +SHOW CREATE TABLE t1; + + +INSERT INTO t1 (a) VALUES ('a'),('a\0'),('a\t'),('a '); +SELECT hex(a),STRCMP(a,'a'), STRCMP(a,'a ') FROM t1; +SELECT HEX(a), a_readable FROM t1 ORDER BY a, BINARY a; +SELECT + HEX(t1.a) AS t1a, + CASE STRCMP(t1.a, t2.a) WHEN -1 THEN '<' WHEN 1 THEN '>' ELSE '=' END AS cmp, + HEX(t2.a) AS t2a, + t1.a_readable, + t2.a_readable +FROM t1 t1, t1 t2 +ORDER BY BINARY t1.a, BINARY t2.a; +DROP TABLE t1; diff --git a/mysql-test/include/ctype_unicode_ws_supplementary.inc b/mysql-test/include/ctype_unicode_ws_supplementary.inc index 82273e8fb6a..87b747d7af8 100644 --- a/mysql-test/include/ctype_unicode_ws_supplementary.inc +++ b/mysql-test/include/ctype_unicode_ws_supplementary.inc @@ -9,11 +9,13 @@ SELECT FROM seq_65536_to_1114111', @@character_set_connection, @@collation_connection); +--disable_service_connection SELECT COLLATION(c) FROM v_supplementary LIMIT 1; SELECT SUM(HEX(WEIGHT_STRING(c))<>'FFFD'), SUM(HEX(WEIGHT_STRING(c))='FFFD') FROM v_supplementary; +--enable_service_connection DROP VIEW v_supplementary; diff --git a/mysql-test/include/ctype_utf8mb4.inc b/mysql-test/include/ctype_utf8mb4.inc index 436b0f2782f..73011cef81d 100644 --- a/mysql-test/include/ctype_utf8mb4.inc +++ b/mysql-test/include/ctype_utf8mb4.inc @@ -58,11 +58,11 @@ select CONVERT(_koi8r' # "a\0" < "a" # "a\0" < "a " -SELECT 'a' = 'a '; -SELECT 'a\0' < 'a'; -SELECT 'a\0' < 'a '; -SELECT 'a\t' < 'a'; -SELECT 'a\t' < 'a '; +SELECT 'a' = 'a ' collate utf8mb4_general_ci; +SELECT 'a\0' < 'a' collate utf8mb4_general_ci; +SELECT 'a\0' < 'a ' collate utf8mb4_general_ci; +SELECT 'a\t' < 'a' collate utf8mb4_general_ci; +SELECT 'a\t' < 'a ' collate utf8mb4_general_ci; # # The same for binary collation @@ -73,7 +73,7 @@ SELECT 'a\0' < 'a ' collate utf8mb4_bin; SELECT 'a\t' < 'a' collate utf8mb4_bin; SELECT 'a\t' < 'a ' collate utf8mb4_bin; -eval CREATE TABLE t1 (a char(10) character set utf8mb4 not null) ENGINE $engine; +eval CREATE TABLE t1 (a char(10) character set utf8mb4 collate utf8mb4_general_ci not null) ENGINE $engine; INSERT INTO t1 VALUES ('a'),('a\0'),('a\t'),('a '); --sorted_result SELECT hex(a),STRCMP(a,'a'), STRCMP(a,'a ') FROM t1; @@ -988,7 +988,7 @@ DROP TABLE t1; # # Bug#17313: N'xxx' and _utf8mb4'xxx' are not equivalent # -eval CREATE TABLE t1 (item varchar(255)) default character set utf8mb4 ENGINE $engine; +eval CREATE TABLE t1 (item varchar(255)) default character set utf8mb4 collate utf8mb4_general_ci ENGINE $engine; INSERT INTO t1 VALUES (N'\\'); INSERT INTO t1 VALUES (_utf8mb4'\\'); INSERT INTO t1 VALUES (N'Cote d\'Ivoire'); @@ -1256,12 +1256,12 @@ SHOW VARIABLES LIKE 'character\_set\_%'; SET @@character_set_server=@save_character_set_server; CREATE DATABASE crashtest DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin; USE crashtest; -eval CREATE TABLE crashtest (crash char(10)) DEFAULT CHARSET=utf8mb4 ENGINE $engine; +eval CREATE TABLE crashtest (crash char(10)) DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_general_ci ENGINE $engine; INSERT INTO crashtest VALUES ('35'), ('36'), ('37'); -SELECT * FROM crashtest ORDER BY CHAR(crash USING utf8mb4); +SELECT * FROM crashtest ORDER BY CHAR(crash USING utf8mb4) COLLATE utf8mb4_general_ci; INSERT INTO crashtest VALUES ('-1000'); -EXPLAIN SELECT * FROM crashtest ORDER BY CHAR(crash USING utf8mb4); -SELECT * FROM crashtest ORDER BY CHAR(crash USING utf8mb4); +EXPLAIN SELECT * FROM crashtest ORDER BY CHAR(crash USING utf8mb4) COLLATE utf8mb4_general_ci; +SELECT * FROM crashtest ORDER BY CHAR(crash USING utf8mb4) COLLATE utf8mb4_general_ci; DROP TABLE crashtest; DROP DATABASE crashtest; USE test; @@ -1557,7 +1557,7 @@ DROP TABLE IF EXISTS t1; eval CREATE TABLE t1 ( predicted_order int NOT NULL, utf8mb4_encoding VARCHAR(10) NOT NULL -) CHARACTER SET utf8mb4 ENGINE $engine; +) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci ENGINE $engine; INSERT INTO t1 VALUES (19, x'E0B696'), (30, x'E0B69AE0B798'), (61, x'E0B6AF'), (93, x'E0B799'), (52, x'E0B6A6'), (73, x'E0B6BBE0B78AE2808D'), (3, x'E0B686'), (56, x'E0B6AA'), (55, x'E0B6A9'), (70, x'E0B6B9'), (94, x'E0B79A'), (80, x'E0B785'), (25, x'E0B69AE0B791'), (48, x'E0B6A2'), (13, x'E0B690'), (86, x'E0B793'), (91, x'E0B79F'), (81, x'E0B786'), (79, x'E0B784'), (14, x'E0B691'), (99, x'E0B78A'), (8, x'E0B68B'), (68, x'E0B6B7'), (22, x'E0B69A'), (16, x'E0B693'), (33, x'E0B69AE0B7B3'), (38, x'E0B69AE0B79D'), (21, x'E0B683'), (11, x'E0B68E'), (77, x'E0B782'), (40, x'E0B69AE0B78A'), (101, x'E0B78AE2808DE0B6BB'), (35, x'E0B69AE0B79A'), (1, x'E0B7B4'), (9, x'E0B68C'), (96, x'E0B79C'), (6, x'E0B689'), (95, x'E0B79B'), (88, x'E0B796'), (64, x'E0B6B3'), (26, x'E0B69AE0B792'), (82, x'E0B78F'), (28, x'E0B69AE0B794'), (39, x'E0B69AE0B79E'), (97, x'E0B79D'), (2, x'E0B685'), (75, x'E0B780'), (34, x'E0B69AE0B799'), (69, x'E0B6B8'), (83, x'E0B790'), (18, x'E0B695'), (90, x'E0B7B2'), (17, x'E0B694'), (72, x'E0B6BB'), (66, x'E0B6B5'), (59, x'E0B6AD'), (44, x'E0B69E'), (15, x'E0B692'), (23, x'E0B69AE0B78F'), (65, x'E0B6B4'), (42, x'E0B69C'), (63, x'E0B6B1'), (85, x'E0B792'), (47, x'E0B6A1'), (49, x'E0B6A3'), (92, x'E0B7B3'), (78, x'E0B783'), (36, x'E0B69AE0B79B'), (4, x'E0B687'), (24, x'E0B69AE0B790'), (87, x'E0B794'), (37, x'E0B69AE0B79C'), (32, x'E0B69AE0B79F'), (29, x'E0B69AE0B796'), (43, x'E0B69D'), (62, x'E0B6B0'), (100, x'E0B78AE2808DE0B6BA'), (60, x'E0B6AE'), (45, x'E0B69F'), (12, x'E0B68F'), (46, x'E0B6A0'), (50, x'E0B6A5'), (51, x'E0B6A4'), (5, x'E0B688'), (76, x'E0B781'), (89, x'E0B798'), (74, x'E0B6BD'), (10, x'E0B68D'), (57, x'E0B6AB'), (71, x'E0B6BA'), (58, x'E0B6AC'), (27, x'E0B69AE0B793'), (54, x'E0B6A8'), (84, x'E0B791'), (31, x'E0B69AE0B7B2'), (98, x'E0B79E'), (53, x'E0B6A7'), (41, x'E0B69B'), (67, x'E0B6B6'), (7, x'E0B68A'), (20, x'E0B682'); SELECT predicted_order, hex(utf8mb4_encoding) FROM t1 ORDER BY utf8mb4_encoding COLLATE utf8mb4_sinhala_ci; DROP TABLE t1; @@ -1642,7 +1642,7 @@ DROP TABLE IF EXISTS t1; eval CREATE TABLE t1 ( u_decimal int NOT NULL, utf8mb4_encoding VARCHAR(10) NOT NULL -) CHARACTER SET utf8mb4 ENGINE $engine; +) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci ENGINE $engine; # Source of the following values: http://www.fileformat.info/info/unicode/block/index.htm # SINGLE BARLINE INSERT INTO t1 VALUES (119040, x'f09d8480'), @@ -1683,7 +1683,7 @@ DROP TABLE IF EXISTS t2; eval CREATE TABLE t2 ( u_decimal int NOT NULL, utf8mb3_encoding VARCHAR(10) NOT NULL -) CHARACTER SET utf8mb3 ENGINE $engine; +) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci ENGINE $engine; # LATIN CAPITAL LETTER VEND INSERT INTO t2 VALUES (42856, x'ea9da8'); # SMALL COMMERCIAL AT @@ -1718,40 +1718,40 @@ SELECT count(*) FROM t1, t2 # Alter from 4-byte charset to 3-byte charset, error --disable_warnings SET STATEMENT sql_mode = 'NO_ENGINE_SUBSTITUTION' FOR -ALTER TABLE t1 CONVERT TO CHARACTER SET utf8; +ALTER TABLE t1 CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci; --enable_warnings SHOW CREATE TABLE t1; --sorted_result SELECT u_decimal,hex(utf8mb4_encoding),utf8mb4_encoding FROM t1; # Alter table from utf8 to utf8mb4 -ALTER TABLE t2 CONVERT TO CHARACTER SET utf8mb4; +ALTER TABLE t2 CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; SHOW CREATE TABLE t2; --sorted_result SELECT u_decimal,hex(utf8mb3_encoding) FROM t2; # Alter table back from utf8mb4 to utf8 -ALTER TABLE t2 CONVERT TO CHARACTER SET utf8mb3; +ALTER TABLE t2 CONVERT TO CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci; SHOW CREATE TABLE t2; --sorted_result SELECT u_decimal,hex(utf8mb3_encoding) FROM t2; # ALter of utf8mb4 column to utf8 --disable_warnings -ALTER TABLE t1 MODIFY utf8mb4_encoding VARCHAR(10) CHARACTER SET utf8mb3; +ALTER TABLE t1 MODIFY utf8mb4_encoding VARCHAR(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci; --enable_warnings SHOW CREATE TABLE t1; --sorted_result SELECT u_decimal,hex(utf8mb4_encoding) FROM t1; # ALter of utf8 column to utf8mb4 -ALTER TABLE t1 MODIFY utf8mb4_encoding VARCHAR(10) CHARACTER SET utf8mb4; +ALTER TABLE t1 MODIFY utf8mb4_encoding VARCHAR(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; SHOW CREATE TABLE t1; --sorted_result SELECT u_decimal,hex(utf8mb4_encoding) FROM t1; # ALter of utf8 column to utf8mb4 -ALTER TABLE t2 MODIFY utf8mb3_encoding VARCHAR(10) CHARACTER SET utf8mb4; +ALTER TABLE t2 MODIFY utf8mb3_encoding VARCHAR(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; SHOW CREATE TABLE t2; --sorted_result SELECT u_decimal,hex(utf8mb3_encoding) FROM t2; @@ -1762,7 +1762,7 @@ DROP TABLE IF EXISTS t3; eval CREATE TABLE t3 ( u_decimal int NOT NULL, utf8mb3_encoding VARCHAR(10) NOT NULL -) CHARACTER SET utf8 ENGINE $engine; +) CHARACTER SET utf8 COLLATE utf8_general_ci ENGINE $engine; # Insert select utf8mb4 (4-byte) into utf8 (3-byte), error #--error ER_INVALID_CHARACTER_STRING @@ -1774,7 +1774,7 @@ DROP TABLE IF EXISTS t4; eval CREATE TABLE t4 ( u_decimal int NOT NULL, utf8mb4_encoding VARCHAR(10) NOT NULL -) CHARACTER SET utf8mb4 ENGINE $engine; +) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci ENGINE $engine; # Insert select utf8 (3-byte) into utf8mb4 (4-byte) INSERT INTO t3 SELECT * FROM t2; @@ -1789,11 +1789,11 @@ DROP TABLE t4; --echo # SELECT CHARSET(CONCAT(_utf8mb4'a',_utf8'b')); -eval CREATE TABLE t1 (utf8mb4 VARCHAR(10) CHARACTER SET utf8mb4 NOT NULL) ENGINE $engine; +eval CREATE TABLE t1 (utf8mb4 VARCHAR(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL) ENGINE $engine; INSERT INTO t1 VALUES (x'ea9da8'),(x'f48fbfbf'); SELECT CONCAT(utf8mb4, _utf8 x'ea9da8') FROM t1 LIMIT 0; -eval CREATE TABLE t2 (utf8mb3 VARCHAR(10) CHARACTER SET utf8mb3 NOT NULL) ENGINE $engine; +eval CREATE TABLE t2 (utf8mb3 VARCHAR(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL) ENGINE $engine; INSERT INTO t2 VALUES (x'ea9da8'); SELECT HEX(CONCAT(utf8mb4, utf8mb3)) FROM t1,t2 ORDER BY 1; @@ -1814,7 +1814,7 @@ DROP TABLE t2; --echo # Check that mixing utf8mb4 with an invalid utf8 constant returns error --echo # # This should perhaps be changed to return ER_INVALID_CHARACTER_STRING -eval CREATE TABLE t1 (utf8mb4 VARCHAR(10) CHARACTER SET utf8mb4) ENGINE $engine; +eval CREATE TABLE t1 (utf8mb4 VARCHAR(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci) ENGINE $engine; INSERT INTO t1 VALUES (x'f48fbfbf'); --error ER_CANT_AGGREGATE_2COLLATIONS SELECT CONCAT(utf8mb4, _utf8 '') FROM t1; @@ -1835,7 +1835,8 @@ DROP TABLE t1; --echo # CREATE TABLE t1 ( id INT NOT NULL AUTO_INCREMENT PRIMARY KEY, - a VARCHAR(10) CHARACTER SET utf8mb4, KEY(a,id) + a VARCHAR(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci, + KEY(a,id) ); INSERT INTO t1 (a) VALUES (0x61); INSERT INTO t1 (a) VALUES (0xC280),(0xDFBF); diff --git a/mysql-test/include/have_utf16.inc b/mysql-test/include/have_utf16.inc index 0dfe8e9ced4..192b5600e6b 100644 --- a/mysql-test/include/have_utf16.inc +++ b/mysql-test/include/have_utf16.inc @@ -1,4 +1,2 @@ --- require include/have_utf16.require -disable_query_log; -show collation like 'utf16_general_ci'; -enable_query_log; +let collation=utf16_general_ci; +--source include/have_collation.inc diff --git a/mysql-test/include/have_utf16.require b/mysql-test/include/have_utf16.require deleted file mode 100644 index a1b5469cad7..00000000000 --- a/mysql-test/include/have_utf16.require +++ /dev/null @@ -1,2 +0,0 @@ -Collation Charset Id Default Compiled Sortlen -utf16_general_ci utf16 54 Yes Yes 1 diff --git a/mysql-test/include/have_utf32.inc b/mysql-test/include/have_utf32.inc index 7d3b2b6938a..8e6e5846529 100644 --- a/mysql-test/include/have_utf32.inc +++ b/mysql-test/include/have_utf32.inc @@ -1,4 +1,2 @@ --- require include/have_utf32.require -disable_query_log; -show collation like 'utf32_general_ci'; -enable_query_log; +let collation=utf32_general_ci; +--source include/have_collation.inc diff --git a/mysql-test/include/have_utf32.require b/mysql-test/include/have_utf32.require deleted file mode 100644 index 710ddb8090c..00000000000 --- a/mysql-test/include/have_utf32.require +++ /dev/null @@ -1,2 +0,0 @@ -Collation Charset Id Default Compiled Sortlen -utf32_general_ci utf32 60 Yes Yes 1 diff --git a/mysql-test/include/have_utf8mb4.inc b/mysql-test/include/have_utf8mb4.inc index 42e7d32a26c..10277ad18d7 100644 --- a/mysql-test/include/have_utf8mb4.inc +++ b/mysql-test/include/have_utf8mb4.inc @@ -1,7 +1,2 @@ ---require include/have_utf8mb4.require - ---disable_query_log - -SHOW COLLATION LIKE 'utf8mb4_general_ci'; - ---enable_query_log +let collation=utf8mb4_general_ci; +--source include/have_collation.inc diff --git a/mysql-test/include/have_utf8mb4.require b/mysql-test/include/have_utf8mb4.require deleted file mode 100644 index 1669b332d0d..00000000000 --- a/mysql-test/include/have_utf8mb4.require +++ /dev/null @@ -1,2 +0,0 @@ -Collation Charset Id Default Compiled Sortlen -utf8mb4_general_ci utf8mb4 45 Yes Yes 1 diff --git a/mysql-test/main/alter_table.result b/mysql-test/main/alter_table.result index 9b2fe43a945..e987cd67de9 100644 --- a/mysql-test/main/alter_table.result +++ b/mysql-test/main/alter_table.result @@ -878,7 +878,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `a` text DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci drop table t1; create table t1 (a mediumtext character set latin1); alter table t1 convert to character set utf8; @@ -886,7 +886,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `a` longtext DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci drop table t1; End of 5.0 tests drop table if exists t1, t2, t3; @@ -1353,7 +1353,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `consultant_id` int(11) NOT NULL -) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci DROP TABLE t1; CREATE TABLE t1 ( `a` int(11) DEFAULT NULL @@ -1365,7 +1365,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `consultant_id` int(11) NOT NULL DEFAULT 2 -) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci DROP TABLE t1; CREATE TABLE t1 ( `a` int(11) DEFAULT NULL @@ -1377,7 +1377,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `consultant_id` int(11) NOT NULL -) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci DROP TABLE t1; CREATE TABLE t1 ( `a` int(11) DEFAULT NULL @@ -1390,7 +1390,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `consultant_id` bigint(20) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci DROP TABLE t1; # # BUG#27788685: NO WARNING WHEN TRUNCATING A STRING WITH DATA LOSS @@ -2201,7 +2201,7 @@ t1 CREATE TABLE `t1` ( `id` int(11) NOT NULL, `a` int(11) NOT NULL, `b` int(11) DEFAULT NULL -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci DROP TABLE t1; # # MDEV-15308 diff --git a/mysql-test/main/column_compression.result b/mysql-test/main/column_compression.result index b377651fa36..f8f937bbdc8 100644 --- a/mysql-test/main/column_compression.result +++ b/mysql-test/main/column_compression.result @@ -868,7 +868,7 @@ ERROR HY000: Compressed column 'a' can't be used in key specification SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` text /*!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL + `a` text /*!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_uca1400_ai_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci # Make sure column was actually compressed INSERT INTO t1 VALUES(REPEAT('a', 1000)); @@ -904,7 +904,7 @@ ALTER TABLE t1 MODIFY COLUMN a TEXT COMPRESSED CHARSET ucs2; SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` text /*!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL + `a` text /*!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_uca1400_ai_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SELECT LEFT(a, 10), LENGTH(a) FROM t1; LEFT(a, 10) LENGTH(a) @@ -921,7 +921,7 @@ CREATE TABLE t2 LIKE t1; SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( - `a` text /*!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL + `a` text /*!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_uca1400_ai_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t2; # Make sure implicit CREATE TABLE ... SELECT inherits compression @@ -929,7 +929,7 @@ CREATE TABLE t2 SELECT * FROM t1; SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( - `a` text /*!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL + `a` text /*!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_uca1400_ai_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SELECT LEFT(a, 10), LENGTH(a) FROM t2; LEFT(a, 10) LENGTH(a) @@ -965,7 +965,7 @@ ALTER TABLE t1 ENGINE=InnoDB; SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` text /*!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL + `a` text /*!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_uca1400_ai_ci DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SELECT LEFT(a, 10), LENGTH(a) FROM t1; LEFT(a, 10) LENGTH(a) @@ -1483,7 +1483,7 @@ CREATE OR REPLACE TABLE t1 (a VARCHAR(1000) COMPRESSED CHARACTER SET utf8); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` varchar(1000) /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL + `a` varchar(1000) /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SELECT COLUMN_TYPE FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_SCHEMA='test' AND TABLE_NAME='t1'; @@ -1559,14 +1559,14 @@ CREATE TABLE t1 (a VARCHAR(10) COMPRESSED UNICODE); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` varchar(10) /*!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL + `a` varchar(10) /*!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_uca1400_ai_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a VARCHAR(10) COMPRESSED CHARACTER SET utf8); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` varchar(10) /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL + `a` varchar(10) /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; # @@ -1598,14 +1598,14 @@ CREATE TABLE t1 (a VARCHAR(10) COMPRESSED CHARACTER SET utf8 DEFAULT ''); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` varchar(10) /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT '' + `a` varchar(10) /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT '' ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a VARCHAR(10) COMPRESSED CHARACTER SET utf8 GENERATED ALWAYS AS (REPEAT('a',100))); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` varchar(10) /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci GENERATED ALWAYS AS (repeat('a',100)) VIRTUAL + `a` varchar(10) /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci GENERATED ALWAYS AS (repeat('a',100)) VIRTUAL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; # @@ -1689,14 +1689,14 @@ CREATE TABLE t1 (a TINYTEXT COMPRESSED UNICODE); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` tinytext /*!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL + `a` tinytext /*!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_uca1400_ai_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a TINYTEXT COMPRESSED CHARACTER SET utf8); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` tinytext /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL + `a` tinytext /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; # @@ -1728,14 +1728,14 @@ CREATE TABLE t1 (a TINYTEXT COMPRESSED CHARACTER SET utf8 DEFAULT ''); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` tinytext /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT '' + `a` tinytext /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT '' ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a TINYTEXT COMPRESSED CHARACTER SET utf8 GENERATED ALWAYS AS (REPEAT('a',100))); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` tinytext /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci GENERATED ALWAYS AS (repeat('a',100)) VIRTUAL + `a` tinytext /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci GENERATED ALWAYS AS (repeat('a',100)) VIRTUAL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; # @@ -1819,14 +1819,14 @@ CREATE TABLE t1 (a TEXT COMPRESSED UNICODE); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` text /*!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL + `a` text /*!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_uca1400_ai_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a TEXT COMPRESSED CHARACTER SET utf8); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` text /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL + `a` text /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; # @@ -1858,14 +1858,14 @@ CREATE TABLE t1 (a TEXT COMPRESSED CHARACTER SET utf8 DEFAULT ''); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` text /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT '' + `a` text /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT '' ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a TEXT COMPRESSED CHARACTER SET utf8 GENERATED ALWAYS AS (REPEAT('a',100))); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` text /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci GENERATED ALWAYS AS (repeat('a',100)) VIRTUAL + `a` text /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci GENERATED ALWAYS AS (repeat('a',100)) VIRTUAL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; # @@ -1949,14 +1949,14 @@ CREATE TABLE t1 (a MEDIUMTEXT COMPRESSED UNICODE); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` mediumtext /*!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL + `a` mediumtext /*!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_uca1400_ai_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a MEDIUMTEXT COMPRESSED CHARACTER SET utf8); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` mediumtext /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL + `a` mediumtext /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; # @@ -1988,14 +1988,14 @@ CREATE TABLE t1 (a MEDIUMTEXT COMPRESSED CHARACTER SET utf8 DEFAULT ''); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` mediumtext /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT '' + `a` mediumtext /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT '' ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a MEDIUMTEXT COMPRESSED CHARACTER SET utf8 GENERATED ALWAYS AS (REPEAT('a',100))); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` mediumtext /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci GENERATED ALWAYS AS (repeat('a',100)) VIRTUAL + `a` mediumtext /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci GENERATED ALWAYS AS (repeat('a',100)) VIRTUAL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; # @@ -2079,14 +2079,14 @@ CREATE TABLE t1 (a LONGTEXT COMPRESSED UNICODE); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` longtext /*!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL + `a` longtext /*!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_uca1400_ai_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a LONGTEXT COMPRESSED CHARACTER SET utf8); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` longtext /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL + `a` longtext /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; # @@ -2118,14 +2118,14 @@ CREATE TABLE t1 (a LONGTEXT COMPRESSED CHARACTER SET utf8 DEFAULT ''); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` longtext /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT '' + `a` longtext /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT '' ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a LONGTEXT COMPRESSED CHARACTER SET utf8 GENERATED ALWAYS AS (REPEAT('a',100))); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` longtext /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci GENERATED ALWAYS AS (repeat('a',100)) VIRTUAL + `a` longtext /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci GENERATED ALWAYS AS (repeat('a',100)) VIRTUAL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; # @@ -2481,7 +2481,7 @@ CREATE TABLE t1 (a NVARCHAR(10) COMPRESSED); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` varchar(10) /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL + `a` varchar(10) /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a NVARCHAR(10) COMPRESSED BINARY COMPRESSED); diff --git a/mysql-test/main/comment_database.result b/mysql-test/main/comment_database.result index 8e3cf1c904e..adc615de6cc 100644 --- a/mysql-test/main/comment_database.result +++ b/mysql-test/main/comment_database.result @@ -51,11 +51,11 @@ USE db1; ALTER DATABASE COMMENT 'db1 comment' CHARACTER SET 'utf8'; SHOW CREATE DATABASE db1; Database Create Database -db1 CREATE DATABASE `db1` /*!40100 DEFAULT CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci */ COMMENT 'db1 comment' +db1 CREATE DATABASE `db1` /*!40100 DEFAULT CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci */ COMMENT 'db1 comment' ALTER DATABASE db1 COMMENT 'this is db1 comment'; SHOW CREATE DATABASE db1; Database Create Database -db1 CREATE DATABASE `db1` /*!40100 DEFAULT CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci */ COMMENT 'this is db1 comment' +db1 CREATE DATABASE `db1` /*!40100 DEFAULT CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci */ COMMENT 'this is db1 comment' ALTER DATABASE CHARACTER SET 'latin1'; SHOW CREATE DATABASE db1; Database Create Database diff --git a/mysql-test/main/create-uca.result b/mysql-test/main/create-uca.result index a27e9d6dd16..4ee96eb37cf 100644 --- a/mysql-test/main/create-uca.result +++ b/mysql-test/main/create-uca.result @@ -13,7 +13,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) DEFAULT 12 COMMENT 'column1', `c2` int(11) DEFAULT NULL COMMENT 'column2', `c3` int(11) NOT NULL COMMENT 'column3', - `c4` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'a', + `c4` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci NOT NULL DEFAULT 'a', `c5` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT 'b', `c6` varchar(255) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_bin @@ -24,7 +24,7 @@ t2 CREATE TABLE `t2` ( `c1` int(11) DEFAULT 12 COMMENT 'column1', `c2` int(11) DEFAULT NULL COMMENT 'column2', `c3` int(11) NOT NULL COMMENT 'column3', - `c4` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'a', + `c4` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci NOT NULL DEFAULT 'a', `c5` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT 'b', `c6` varchar(255) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci diff --git a/mysql-test/main/create_utf8.result b/mysql-test/main/create_utf8.result index a986454bbeb..c45556dfb3f 100644 --- a/mysql-test/main/create_utf8.result +++ b/mysql-test/main/create_utf8.result @@ -46,7 +46,7 @@ Table Create Table ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci show create view имя_вью_кодировке_утф8_длиной_больше_чем_42; View Create View character_set_client collation_connection -имя_вью_кодировке_утф8_длиной_больше_чем_42 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `имя_вью_кодировке_утф8_длиной_больше_чем_42` AS select `имя_таблицы_в_кодировке_утф8_длиной_больше_чем_48`.`имя_поля_в_кодировке_утф8_длиной_больше_чем_45` AS `имя_поля_в_кодировке_утф8_длиной_больше_чем_45` from `имя_таблицы_в_кодировке_утф8_длиной_больше_чем_48` utf8mb3 utf8mb3_general_ci +имя_вью_кодировке_утф8_длиной_больше_чем_42 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `имя_вью_кодировке_утф8_длиной_больше_чем_42` AS select `имя_таблицы_в_кодировке_утф8_длиной_больше_чем_48`.`имя_поля_в_кодировке_утф8_длиной_больше_чем_45` AS `имя_поля_в_кодировке_утф8_длиной_больше_чем_45` from `имя_таблицы_в_кодировке_утф8_длиной_больше_чем_48` utf8mb3 utf8mb3_uca1400_ai_ci create trigger имя_триггера_в_кодировке_утф8_длиной_больше_чем_49 before insert on имя_таблицы_в_кодировке_утф8_длиной_больше_чем_48 for each row set @a:=1; select TRIGGER_NAME from information_schema.triggers where diff --git a/mysql-test/main/cset_narrowing.result b/mysql-test/main/cset_narrowing.result index 377cbdaecf3..8c5c6809e27 100644 --- a/mysql-test/main/cset_narrowing.result +++ b/mysql-test/main/cset_narrowing.result @@ -32,7 +32,7 @@ test.t10 analyze status OK # select collation('abc'); collation('abc') -utf8mb4_general_ci +utf8mb4_uca1400_ai_ci explain select * from t1 force index (mb3) where t1.mb3='abc'; id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t1 ref mb3 mb3 99 const 1 Using index condition @@ -47,7 +47,7 @@ id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t1 range mb3 mb3 99 NULL 1 Using index condition # If a constant can't be represented in utf8mb3, an error is produced: explain select * from t1 force index (mb3) where t1.mb3='😊'; -ERROR HY000: Illegal mix of collations (utf8mb3_general_ci,IMPLICIT) and (utf8mb4_general_ci,COERCIBLE) for operation '=' +ERROR HY000: Illegal mix of collations (utf8mb3_general_ci,IMPLICIT) and (utf8mb4_uca1400_ai_ci,COERCIBLE) for operation '=' # # Check ref access on mb3_field=mb4_field # diff --git a/mysql-test/main/ctype_collate_column.result b/mysql-test/main/ctype_collate_column.result index e109d4afb1a..3cb70df0f71 100644 --- a/mysql-test/main/ctype_collate_column.result +++ b/mysql-test/main/ctype_collate_column.result @@ -4,6 +4,7 @@ # # MDEV-27853 Wrong data type on column `COLLATE DEFAULT` and table `COLLATE some_non_default_collation` # +SET character_set_collations='utf8mb4=utf8mb4_general_ci'; CREATE TABLE t1 ( a CHAR(10) COLLATE DEFAULT ) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin; @@ -11811,6 +11812,7 @@ DROP FUNCTION is_conflicting_charset_explicit_collate_explicit; DROP FUNCTION is_conflicting_collate_explicit2; DROP FUNCTION is_conflicting_collate_default_collate_explicit; DROP FUNCTION collate_cs_default_collation; +SET character_set_collations=DEFAULT; # # End of 10.9 tests # diff --git a/mysql-test/main/ctype_collate_column.test b/mysql-test/main/ctype_collate_column.test index 1e85e454a02..e6e98bc6258 100644 --- a/mysql-test/main/ctype_collate_column.test +++ b/mysql-test/main/ctype_collate_column.test @@ -8,6 +8,8 @@ --echo # MDEV-27853 Wrong data type on column `COLLATE DEFAULT` and table `COLLATE some_non_default_collation` --echo # +SET character_set_collations='utf8mb4=utf8mb4_general_ci'; + CREATE TABLE t1 ( a CHAR(10) COLLATE DEFAULT ) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin; @@ -621,6 +623,7 @@ DROP FUNCTION is_conflicting_collate_explicit2; DROP FUNCTION is_conflicting_collate_default_collate_explicit; DROP FUNCTION collate_cs_default_collation; +SET character_set_collations=DEFAULT; --echo # --echo # End of 10.9 tests diff --git a/mysql-test/main/ctype_collate_context.result b/mysql-test/main/ctype_collate_context.result index c924f11d9e2..a00ab43992f 100644 --- a/mysql-test/main/ctype_collate_context.result +++ b/mysql-test/main/ctype_collate_context.result @@ -1,3 +1,4 @@ +SET character_set_collations='utf8mb4=utf8mb4_general_ci'; CREATE TABLE t0 (a VARCHAR(64)); INSERT INTO t0 VALUES ('CHARACTER SET DEFAULT'), @@ -3688,6 +3689,7 @@ DROP TABLE results_alter_db; DROP TABLE results_create_table; DROP TABLE results_alter_table; DROP TABLE results_convert_table; +SET character_set_collations=DEFAULT; # # MDEV-30003 Assertion failure upon 2nd execution of SP trying to set collation on non-existing database # diff --git a/mysql-test/main/ctype_collate_context.test b/mysql-test/main/ctype_collate_context.test index 95a46f2d830..38f15d55d0a 100644 --- a/mysql-test/main/ctype_collate_context.test +++ b/mysql-test/main/ctype_collate_context.test @@ -1,5 +1,6 @@ --source include/have_utf8mb4.inc +SET character_set_collations='utf8mb4=utf8mb4_general_ci'; CREATE TABLE t0 (a VARCHAR(64)); INSERT INTO t0 VALUES @@ -367,6 +368,8 @@ DROP TABLE results_create_table; DROP TABLE results_alter_table; DROP TABLE results_convert_table; +SET character_set_collations=DEFAULT; + --echo # --echo # MDEV-30003 Assertion failure upon 2nd execution of SP trying to set collation on non-existing database --echo # diff --git a/mysql-test/main/ctype_collate_database.result b/mysql-test/main/ctype_collate_database.result index 6af984606d6..ff0854ed169 100644 --- a/mysql-test/main/ctype_collate_database.result +++ b/mysql-test/main/ctype_collate_database.result @@ -23,7 +23,7 @@ DROP DATABASE db1; CREATE DATABASE db1 COLLATE DEFAULT; SELECT * FROM cscl; DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME -utf8mb4 utf8mb4_general_ci +utf8mb4 utf8mb4_uca1400_ai_ci DROP DATABASE db1; CREATE DATABASE db1 COLLATE latin1_bin; SELECT * FROM cscl; @@ -68,12 +68,12 @@ DROP DATABASE db1; CREATE DATABASE db1 CHARACTER SET DEFAULT COLLATE DEFAULT; SELECT * FROM cscl; DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME -utf8mb4 utf8mb4_general_ci +utf8mb4 utf8mb4_uca1400_ai_ci DROP DATABASE db1; CREATE DATABASE db1 COLLATE DEFAULT CHARACTER SET DEFAULT; SELECT * FROM cscl; DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME -utf8mb4 utf8mb4_general_ci +utf8mb4 utf8mb4_uca1400_ai_ci DROP DATABASE db1; CREATE DATABASE db1 CHARACTER SET DEFAULT CHARACTER SET utf8mb4; SELECT * FROM cscl; diff --git a/mysql-test/main/ctype_collate_implicit.result b/mysql-test/main/ctype_collate_implicit.result index 7d42ab1bc94..9f189af8024 100644 --- a/mysql-test/main/ctype_collate_implicit.result +++ b/mysql-test/main/ctype_collate_implicit.result @@ -266,7 +266,7 @@ utf8mb3_bin utf8mb3_bin SET @@character_set_collations=DEFAULT; EXECUTE stmt; a b -utf8mb3_general_ci utf8mb3_general_ci +utf8mb3_uca1400_ai_ci utf8mb3_uca1400_ai_ci SET NAMES utf8mb3; SET @@character_set_collations=''; PREPARE stmt FROM 'CREATE TABLE t1 ' diff --git a/mysql-test/main/ctype_collate_table.result b/mysql-test/main/ctype_collate_table.result index 131c7e76cf1..183e4d383bd 100644 --- a/mysql-test/main/ctype_collate_table.result +++ b/mysql-test/main/ctype_collate_table.result @@ -23,7 +23,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `a` char(10) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci +) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci DROP TABLE t1; # # MDEV-28117 Multiple conflicting table COLLATE clauses are not rejected diff --git a/mysql-test/main/ctype_cp1250_ch.result b/mysql-test/main/ctype_cp1250_ch.result index 6a0d1969fc5..7f0f6f06f7f 100644 --- a/mysql-test/main/ctype_cp1250_ch.result +++ b/mysql-test/main/ctype_cp1250_ch.result @@ -112,7 +112,7 @@ CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS c1 LIMIT 0; SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL + `c1` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci INSERT INTO t1 VALUES ('a'),('a '); SELECT * FROM t1 WHERE CONCAT(c1)='a'; @@ -135,7 +135,7 @@ CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS c1 LIMIT 0; SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL + `c1` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci INSERT INTO t1 VALUES ('a'),('a '); SELECT * FROM t1 WHERE 'a'=CONCAT(c1); @@ -158,7 +158,7 @@ CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS c1 LIMIT 0; SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL + `c1` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci INSERT INTO t1 VALUES ('%'),('% '); SELECT * FROM t1 WHERE '% '=CONCAT(c1); @@ -181,7 +181,7 @@ CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS c1 LIMIT 0; SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL + `c1` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci INSERT INTO t1 VALUES ('%'),('% '); SELECT * FROM t1 WHERE '%'=CONCAT(c1); @@ -207,7 +207,7 @@ CREATE TABLE t1 AS SELECT SPACE(10) AS a LIMIT 0; SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL + `a` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci INSERT INTO t1 VALUES ('a'),('a '); SELECT a, LENGTH(a) FROM t1 WHERE a NOT LIKE 'a '; diff --git a/mysql-test/main/ctype_create.result b/mysql-test/main/ctype_create.result index 8f818450024..0bd88c11a59 100644 --- a/mysql-test/main/ctype_create.result +++ b/mysql-test/main/ctype_create.result @@ -102,15 +102,15 @@ ALTER TABLE t1 CONVERT TO CHARACTER SET utf8, CHARACTER SET latin1; SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL, - `b` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL + `a` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL, + `b` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 CONVERT TO CHARACTER SET utf8, CHARACTER SET DEFAULT; SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL, - `b` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL + `a` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL, + `b` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin5 COLLATE=latin5_turkish_ci ALTER TABLE t1 CONVERT TO CHARACTER SET latin1, CHARACTER SET utf8; SHOW CREATE TABLE t1; @@ -118,7 +118,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` varchar(10) CHARACTER SET latin1 COLLATE latin1_swedish_ci DEFAULT NULL, `b` varchar(10) CHARACTER SET latin1 COLLATE latin1_swedish_ci DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci ALTER TABLE t1 CONVERT TO CHARACTER SET latin1, CHARACTER SET DEFAULT; SHOW CREATE TABLE t1; Table Create Table @@ -132,7 +132,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` varchar(10) CHARACTER SET latin5 COLLATE latin5_turkish_ci DEFAULT NULL, `b` varchar(10) CHARACTER SET latin5 COLLATE latin5_turkish_ci DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci ALTER TABLE t1 CONVERT TO CHARACTER SET DEFAULT, CHARACTER SET latin1; SHOW CREATE TABLE t1; Table Create Table @@ -144,15 +144,15 @@ ALTER TABLE t1 CHARACTER SET latin1, CONVERT TO CHARACTER SET utf8; SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL, - `b` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL + `a` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL, + `b` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 CHARACTER SET DEFAULT, CONVERT TO CHARACTER SET utf8; SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL, - `b` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL + `a` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL, + `b` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin5 COLLATE=latin5_turkish_ci ALTER TABLE t1 CHARACTER SET utf8, CONVERT TO CHARACTER SET latin1; SHOW CREATE TABLE t1; @@ -160,7 +160,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` varchar(10) CHARACTER SET latin1 COLLATE latin1_swedish_ci DEFAULT NULL, `b` varchar(10) CHARACTER SET latin1 COLLATE latin1_swedish_ci DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci ALTER TABLE t1 CHARACTER SET DEFAULT, CONVERT TO CHARACTER SET latin1; SHOW CREATE TABLE t1; Table Create Table @@ -174,7 +174,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` varchar(10) CHARACTER SET latin5 COLLATE latin5_turkish_ci DEFAULT NULL, `b` varchar(10) CHARACTER SET latin5 COLLATE latin5_turkish_ci DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci ALTER TABLE t1 CHARACTER SET latin1, CONVERT TO CHARACTER SET DEFAULT; SHOW CREATE TABLE t1; Table Create Table diff --git a/mysql-test/main/ctype_euckr.result b/mysql-test/main/ctype_euckr.result index 9e030f9cc6d..8de90f89a26 100644 --- a/mysql-test/main/ctype_euckr.result +++ b/mysql-test/main/ctype_euckr.result @@ -2244,7 +2244,7 @@ FE80 DELETE FROM t2 WHERE a='?'; ALTER TABLE t2 ADD u VARCHAR(1) CHARACTER SET utf8, ADD a2 VARCHAR(1) CHARACTER SET euckr; UPDATE IGNORE t2 SET u=a, a2=u; -SELECT s as unassigned_code FROM t2 WHERE u='?'; +SELECT s as unassigned_code FROM t2 WHERE u=binary'?'; unassigned_code A2E8 A2E9 @@ -7626,7 +7626,7 @@ FEFB FEFC FEFD FEFE -DELETE FROM t2 WHERE u='?'; +DELETE FROM t2 WHERE u=binary'?'; SELECT count(*) as roundtrip_problem_chars FROM t2 WHERE hex(a) <> hex(a2); roundtrip_problem_chars 0 diff --git a/mysql-test/main/ctype_euckr.test b/mysql-test/main/ctype_euckr.test index e4f07081dba..cd6e952abe0 100644 --- a/mysql-test/main/ctype_euckr.test +++ b/mysql-test/main/ctype_euckr.test @@ -103,8 +103,15 @@ ALTER TABLE t2 ADD u VARCHAR(1) CHARACTER SET utf8, ADD a2 VARCHAR(1) CHARACTER --disable_warnings UPDATE IGNORE t2 SET u=a, a2=u; --enable_warnings -SELECT s as unassigned_code FROM t2 WHERE u='?'; -DELETE FROM t2 WHERE u='?'; +# +# _euckr 0xA3BF is "U+FF1F FULLWIDTH QUESTION MARK". +# In utf8mb3_uca1400_ai_ci, which is the collation for t1.u, +# it's equal to "U+003F QUESTION MARK". +# Let's use the `binary` keyword in the comparison +# to avoid 0xA3BF being displayed as unassigned character. +# +SELECT s as unassigned_code FROM t2 WHERE u=binary'?'; +DELETE FROM t2 WHERE u=binary'?'; # Make sure there are no euckr->utf8->euckr roundtrip problems SELECT count(*) as roundtrip_problem_chars FROM t2 WHERE hex(a) <> hex(a2); SELECT s, hex(a), hex(u), hex(a2) FROM t2 ORDER BY s; diff --git a/mysql-test/main/ctype_gbk.result b/mysql-test/main/ctype_gbk.result index f27c572098d..3c5e59ba756 100644 --- a/mysql-test/main/ctype_gbk.result +++ b/mysql-test/main/ctype_gbk.result @@ -1067,8 +1067,10 @@ A8B7 ǚ A8B8 ǜ A8B9 ü A8BA ê +A8BB ɑ A8BD ń A8BE ň +A8C0 ɡ Warnings: Warning 1977 Cannot convert 'gbk' character 0xA140 to 'utf8mb3' Warning 1977 Cannot convert 'gbk' character 0xA140 to 'utf8mb3' diff --git a/mysql-test/main/ctype_gbk_export_import.result b/mysql-test/main/ctype_gbk_export_import.result index 664f515b35c..3f2e19ee44a 100644 --- a/mysql-test/main/ctype_gbk_export_import.result +++ b/mysql-test/main/ctype_gbk_export_import.result @@ -49,7 +49,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `id` int(11) NOT NULL, `a1` text NOT NULL, - `a2` text CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL, + `a2` text CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci NOT NULL, `b1` blob NOT NULL, `eol` text NOT NULL ) ENGINE=MyISAM DEFAULT CHARSET=gbk COLLATE=gbk_chinese_ci diff --git a/mysql-test/main/ctype_like_range.result b/mysql-test/main/ctype_like_range.result index ec54d95540a..de4126fc31e 100644 --- a/mysql-test/main/ctype_like_range.result +++ b/mysql-test/main/ctype_like_range.result @@ -284,7 +284,7 @@ id name val 32 mn 63616161616161616161616161616161 32 mx 63616161616161616161616161616161 32 sp -------------------------------- -ALTER TABLE t1 MODIFY a VARCHAR(32) CHARACTER SET utf8; +ALTER TABLE t1 MODIFY a VARCHAR(32) CHARACTER SET utf8 COLLATE utf8_general_ci; INSERT INTO t1 (a) VALUES (_ucs2 0x0425),(_ucs2 0x045F); INSERT INTO t1 (a) VALUES (_ucs2 0x2525),(_ucs2 0x5F5F); SELECT * FROM v1; @@ -433,6 +433,153 @@ id name val 36 mn E5BD9F 36 mx E5BD9F 36 sp -------------------------------- +ALTER TABLE t1 MODIFY a VARCHAR(32) CHARACTER SET utf8 COLLATE utf8_uca1400_ai_ci; +SELECT * FROM v1; +id name val +1 a +1 mn +1 mx +1 sp -------------------------------- +2 a _ +2 mn 09090909090909090909090909090909 +2 mx EFBFBFEFBFBFEFBFBFEFBFBFEFBFBF20 +2 sp -------------------------------- +3 a % +3 mn 09090909090909090909090909090909 +3 mx EFBFBFEFBFBFEFBFBFEFBFBFEFBFBF20 +3 sp -------------------------------- +4 a \_ +4 mn 5F +4 mx 5F +4 sp -------------------------------- +5 a \% +5 mn 25 +5 mx 25 +5 sp -------------------------------- +6 a \ +6 mn 5C +6 mx 5C +6 sp -------------------------------- +7 a a +7 mn 61 +7 mx 61 +7 sp -------------------------------- +8 a c +8 mn 63 +8 mx 63 +8 sp -------------------------------- +9 a a_ +9 mn 61090909090909090909090909090909 +9 mx 61EFBFBFEFBFBFEFBFBFEFBFBFEFBFBF +9 sp -------------------------------- +10 a c_ +10 mn 63090909090909090909090909090909 +10 mx 63EFBFBFEFBFBFEFBFBFEFBFBFEFBFBF +10 sp -------------------------------- +11 a a% +11 mn 61090909090909090909090909090909 +11 mx 61EFBFBFEFBFBFEFBFBFEFBFBFEFBFBF +11 sp -------------------------------- +12 a c% +12 mn 63090909090909090909090909090909 +12 mx 63EFBFBFEFBFBFEFBFBFEFBFBFEFBFBF +12 sp -------------------------------- +13 a aa +13 mn 6161 +13 mx 6161 +13 sp -------------------------------- +14 a cc +14 mn 6363 +14 mx 6363 +14 sp -------------------------------- +15 a ch +15 mn 6368 +15 mx 6368 +15 sp -------------------------------- +16 a aa_ +16 mn 61610909090909090909090909090909 +16 mx 6161EFBFBFEFBFBFEFBFBFEFBFBF2020 +16 sp -------------------------------- +17 a cc_ +17 mn 63630909090909090909090909090909 +17 mx 6363EFBFBFEFBFBFEFBFBFEFBFBF2020 +17 sp -------------------------------- +18 a ch_ +18 mn 63680909090909090909090909090909 +18 mx 6368EFBFBFEFBFBFEFBFBFEFBFBF2020 +18 sp -------------------------------- +19 a aa% +19 mn 61610909090909090909090909090909 +19 mx 6161EFBFBFEFBFBFEFBFBFEFBFBF2020 +19 sp -------------------------------- +20 a cc% +20 mn 63630909090909090909090909090909 +20 mx 6363EFBFBFEFBFBFEFBFBFEFBFBF2020 +20 sp -------------------------------- +21 a ch% +21 mn 63680909090909090909090909090909 +21 mx 6368EFBFBFEFBFBFEFBFBFEFBFBF2020 +21 sp -------------------------------- +22 a aaa +22 mn 616161 +22 mx 616161 +22 sp -------------------------------- +23 a ccc +23 mn 636363 +23 mx 636363 +23 sp -------------------------------- +24 a cch +24 mn 636368 +24 mx 636368 +24 sp -------------------------------- +25 a aaa_ +25 mn 61616109090909090909090909090909 +25 mx 616161EFBFBFEFBFBFEFBFBFEFBFBF20 +25 sp -------------------------------- +26 a ccc_ +26 mn 63636309090909090909090909090909 +26 mx 636363EFBFBFEFBFBFEFBFBFEFBFBF20 +26 sp -------------------------------- +27 a cch_ +27 mn 63636809090909090909090909090909 +27 mx 636368EFBFBFEFBFBFEFBFBFEFBFBF20 +27 sp -------------------------------- +28 a aaa% +28 mn 61616109090909090909090909090909 +28 mx 616161EFBFBFEFBFBFEFBFBFEFBFBF20 +28 sp -------------------------------- +29 a ccc% +29 mn 63636309090909090909090909090909 +29 mx 636363EFBFBFEFBFBFEFBFBFEFBFBF20 +29 sp -------------------------------- +30 a cch% +30 mn 63636809090909090909090909090909 +30 mx 636368EFBFBFEFBFBFEFBFBFEFBFBF20 +30 sp -------------------------------- +31 a aaaaaaaaaaaaaaaaaaaa +31 mn 6161616161 +31 mx 6161616161 +31 sp -------------------------------- +32 a caaaaaaaaaaaaaaaaaaa +32 mn 6361616161 +32 mx 6361616161 +32 sp -------------------------------- +33 a Х +33 mn D0A5 +33 mx D0A5 +33 sp -------------------------------- +34 a џ +34 mn D19F +34 mx D19F +34 sp -------------------------------- +35 a ┥ +35 mn E294A5 +35 mx E294A5 +35 sp -------------------------------- +36 a 彟 +36 mn E5BD9F +36 mx E5BD9F +36 sp -------------------------------- ALTER TABLE t1 MODIFY a VARCHAR(32) CHARACTER SET utf8 COLLATE utf8_unicode_ci; SELECT * FROM v1; id name val @@ -1021,7 +1168,7 @@ id name val 36 mn E5BD9F 36 mx E5BD9F 36 sp -------------------------------- -ALTER TABLE t1 MODIFY a VARCHAR(32) CHARACTER SET utf8mb4; +ALTER TABLE t1 MODIFY a VARCHAR(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; SELECT * FROM v1; id name val 1 a @@ -1168,6 +1315,153 @@ id name val 36 mn E5BD9F 36 mx E5BD9F 36 sp -------------------------------- +ALTER TABLE t1 MODIFY a VARCHAR(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_uca1400_ai_ci; +SELECT * FROM v1; +id name val +1 a +1 mn +1 mx +1 sp -------------------------------- +2 a _ +2 mn 09090909090909090909090909090909 +2 mx F48FBFBFF48FBFBFF48FBFBFF48FBFBF +2 sp -------------------------------- +3 a % +3 mn 09090909090909090909090909090909 +3 mx F48FBFBFF48FBFBFF48FBFBFF48FBFBF +3 sp -------------------------------- +4 a \_ +4 mn 5F +4 mx 5F +4 sp -------------------------------- +5 a \% +5 mn 25 +5 mx 25 +5 sp -------------------------------- +6 a \ +6 mn 5C +6 mx 5C +6 sp -------------------------------- +7 a a +7 mn 61 +7 mx 61 +7 sp -------------------------------- +8 a c +8 mn 63 +8 mx 63 +8 sp -------------------------------- +9 a a_ +9 mn 61090909090909090909090909090909 +9 mx 61F48FBFBFF48FBFBFF48FBFBF202020 +9 sp -------------------------------- +10 a c_ +10 mn 63090909090909090909090909090909 +10 mx 63F48FBFBFF48FBFBFF48FBFBF202020 +10 sp -------------------------------- +11 a a% +11 mn 61090909090909090909090909090909 +11 mx 61F48FBFBFF48FBFBFF48FBFBF202020 +11 sp -------------------------------- +12 a c% +12 mn 63090909090909090909090909090909 +12 mx 63F48FBFBFF48FBFBFF48FBFBF202020 +12 sp -------------------------------- +13 a aa +13 mn 6161 +13 mx 6161 +13 sp -------------------------------- +14 a cc +14 mn 6363 +14 mx 6363 +14 sp -------------------------------- +15 a ch +15 mn 6368 +15 mx 6368 +15 sp -------------------------------- +16 a aa_ +16 mn 61610909090909090909090909090909 +16 mx 6161F48FBFBFF48FBFBFF48FBFBF2020 +16 sp -------------------------------- +17 a cc_ +17 mn 63630909090909090909090909090909 +17 mx 6363F48FBFBFF48FBFBFF48FBFBF2020 +17 sp -------------------------------- +18 a ch_ +18 mn 63680909090909090909090909090909 +18 mx 6368F48FBFBFF48FBFBFF48FBFBF2020 +18 sp -------------------------------- +19 a aa% +19 mn 61610909090909090909090909090909 +19 mx 6161F48FBFBFF48FBFBFF48FBFBF2020 +19 sp -------------------------------- +20 a cc% +20 mn 63630909090909090909090909090909 +20 mx 6363F48FBFBFF48FBFBFF48FBFBF2020 +20 sp -------------------------------- +21 a ch% +21 mn 63680909090909090909090909090909 +21 mx 6368F48FBFBFF48FBFBFF48FBFBF2020 +21 sp -------------------------------- +22 a aaa +22 mn 616161 +22 mx 616161 +22 sp -------------------------------- +23 a ccc +23 mn 636363 +23 mx 636363 +23 sp -------------------------------- +24 a cch +24 mn 636368 +24 mx 636368 +24 sp -------------------------------- +25 a aaa_ +25 mn 61616109090909090909090909090909 +25 mx 616161F48FBFBFF48FBFBFF48FBFBF20 +25 sp -------------------------------- +26 a ccc_ +26 mn 63636309090909090909090909090909 +26 mx 636363F48FBFBFF48FBFBFF48FBFBF20 +26 sp -------------------------------- +27 a cch_ +27 mn 63636809090909090909090909090909 +27 mx 636368F48FBFBFF48FBFBFF48FBFBF20 +27 sp -------------------------------- +28 a aaa% +28 mn 61616109090909090909090909090909 +28 mx 616161F48FBFBFF48FBFBFF48FBFBF20 +28 sp -------------------------------- +29 a ccc% +29 mn 63636309090909090909090909090909 +29 mx 636363F48FBFBFF48FBFBFF48FBFBF20 +29 sp -------------------------------- +30 a cch% +30 mn 63636809090909090909090909090909 +30 mx 636368F48FBFBFF48FBFBFF48FBFBF20 +30 sp -------------------------------- +31 a aaaaaaaaaaaaaaaaaaaa +31 mn 61616161 +31 mx 61616161 +31 sp -------------------------------- +32 a caaaaaaaaaaaaaaaaaaa +32 mn 63616161 +32 mx 63616161 +32 sp -------------------------------- +33 a Х +33 mn D0A5 +33 mx D0A5 +33 sp -------------------------------- +34 a џ +34 mn D19F +34 mx D19F +34 sp -------------------------------- +35 a ┥ +35 mn E294A5 +35 mx E294A5 +35 sp -------------------------------- +36 a 彟 +36 mn E5BD9F +36 mx E5BD9F +36 sp -------------------------------- ALTER TABLE t1 MODIFY a VARCHAR(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; SELECT * FROM v1; id name val @@ -1903,7 +2197,7 @@ id name val 36 mn E5BD9F 36 mx E5BD9F 36 sp -------------------------------- -ALTER TABLE t1 MODIFY a VARCHAR(32) CHARACTER SET ucs2; +ALTER TABLE t1 MODIFY a VARCHAR(32) CHARACTER SET ucs2 COLLATE ucs2_general_ci; SELECT * FROM v1; id name val 1 a @@ -2638,7 +2932,7 @@ id name val 36 mn 5F5F 36 mx 5F5F 36 sp -------------------------------- -ALTER TABLE t1 MODIFY a VARCHAR(32) CHARACTER SET utf16; +ALTER TABLE t1 MODIFY a VARCHAR(32) CHARACTER SET utf16 COLLATE utf16_general_ci; SELECT * FROM v1; id name val 1 a @@ -3520,7 +3814,7 @@ id name val 36 mn 5F5F 36 mx 5F5F 36 sp -------------------------------- -ALTER TABLE t1 MODIFY a VARCHAR(32) CHARACTER SET utf32; +ALTER TABLE t1 MODIFY a VARCHAR(32) CHARACTER SET utf32 COLLATE utf32_general_ci; SELECT * FROM v1; id name val 1 a diff --git a/mysql-test/main/ctype_like_range.test b/mysql-test/main/ctype_like_range.test index 7f00964ddb7..24352ad58e3 100644 --- a/mysql-test/main/ctype_like_range.test +++ b/mysql-test/main/ctype_like_range.test @@ -39,11 +39,14 @@ SELECT * FROM v1; ALTER TABLE t1 MODIFY a VARCHAR(32) CHARACTER SET latin1; SELECT * FROM v1; -ALTER TABLE t1 MODIFY a VARCHAR(32) CHARACTER SET utf8; +ALTER TABLE t1 MODIFY a VARCHAR(32) CHARACTER SET utf8 COLLATE utf8_general_ci; INSERT INTO t1 (a) VALUES (_ucs2 0x0425),(_ucs2 0x045F); INSERT INTO t1 (a) VALUES (_ucs2 0x2525),(_ucs2 0x5F5F); SELECT * FROM v1; +ALTER TABLE t1 MODIFY a VARCHAR(32) CHARACTER SET utf8 COLLATE utf8_uca1400_ai_ci; +SELECT * FROM v1; + ALTER TABLE t1 MODIFY a VARCHAR(32) CHARACTER SET utf8 COLLATE utf8_unicode_ci; SELECT * FROM v1; @@ -59,7 +62,10 @@ SELECT * FROM v1; ALTER TABLE t1 MODIFY a VARCHAR(32) CHARACTER SET utf8 COLLATE utf8_thai_520_w2; SELECT * FROM v1; -ALTER TABLE t1 MODIFY a VARCHAR(32) CHARACTER SET utf8mb4; +ALTER TABLE t1 MODIFY a VARCHAR(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; +SELECT * FROM v1; + +ALTER TABLE t1 MODIFY a VARCHAR(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_uca1400_ai_ci; SELECT * FROM v1; ALTER TABLE t1 MODIFY a VARCHAR(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; @@ -80,7 +86,7 @@ SELECT * FROM v1; ALTER TABLE t1 MODIFY a VARCHAR(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_520_ci; SELECT * FROM v1; -ALTER TABLE t1 MODIFY a VARCHAR(32) CHARACTER SET ucs2; +ALTER TABLE t1 MODIFY a VARCHAR(32) CHARACTER SET ucs2 COLLATE ucs2_general_ci; SELECT * FROM v1; ALTER TABLE t1 MODIFY a VARCHAR(32) CHARACTER SET ucs2 COLLATE ucs2_unicode_ci; @@ -95,7 +101,7 @@ SELECT * FROM v1; ALTER TABLE t1 MODIFY a VARCHAR(32) CHARACTER SET ucs2 COLLATE ucs2_thai_520_w2; SELECT * FROM v1; -ALTER TABLE t1 MODIFY a VARCHAR(32) CHARACTER SET utf16; +ALTER TABLE t1 MODIFY a VARCHAR(32) CHARACTER SET utf16 COLLATE utf16_general_ci; SELECT * FROM v1; ALTER TABLE t1 MODIFY a VARCHAR(32) CHARACTER SET utf16 COLLATE utf16_unicode_ci; @@ -116,7 +122,7 @@ SELECT * FROM v1; ALTER TABLE t1 MODIFY a VARCHAR(32) CHARACTER SET utf16 COLLATE utf16_unicode_520_ci; SELECT * FROM v1; -ALTER TABLE t1 MODIFY a VARCHAR(32) CHARACTER SET utf32; +ALTER TABLE t1 MODIFY a VARCHAR(32) CHARACTER SET utf32 COLLATE utf32_general_ci; SELECT * FROM v1; ALTER TABLE t1 MODIFY a VARCHAR(32) CHARACTER SET utf32 COLLATE utf32_unicode_ci; diff --git a/mysql-test/main/ctype_many.result b/mysql-test/main/ctype_many.result index e3706f9d637..eacfb0a3e8e 100644 --- a/mysql-test/main/ctype_many.result +++ b/mysql-test/main/ctype_many.result @@ -219,7 +219,7 @@ z LAT CAPIT Z 2 э CYR CAPIT E 2 ю CYR CAPIT YU 2 я CYR CAPIT YA 2 -ALTER TABLE t1 ADD utf8_f CHAR(32) CHARACTER SET utf8 NOT NULL default ''; +ALTER TABLE t1 ADD utf8_f CHAR(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL default ''; UPDATE t1 SET utf8_f=CONVERT(koi8_ru_f USING utf8); SET CHARACTER SET koi8r; SELECT * FROM t1; @@ -1721,44 +1721,44 @@ SELECT CHARSET(CONCAT(utf8, utf8mb4)) FROM t1; CHARSET(CONCAT(utf8, utf8mb4)) utf8mb4 SELECT CHARSET(CONCAT(utf8, ucs2)) FROM t1; -ERROR HY000: Illegal mix of collations (utf8mb3_general_ci,IMPLICIT) and (ucs2_general_ci,IMPLICIT) for operation 'concat' +ERROR HY000: Illegal mix of collations (utf8mb3_uca1400_ai_ci,IMPLICIT) and (ucs2_uca1400_ai_ci,IMPLICIT) for operation 'concat' SELECT CHARSET(CONCAT(utf8, utf16)) FROM t1; -ERROR HY000: Illegal mix of collations (utf8mb3_general_ci,IMPLICIT) and (utf16_general_ci,IMPLICIT) for operation 'concat' +ERROR HY000: Illegal mix of collations (utf8mb3_uca1400_ai_ci,IMPLICIT) and (utf16_uca1400_ai_ci,IMPLICIT) for operation 'concat' SELECT CHARSET(CONCAT(utf8, utf32)) FROM t1; -ERROR HY000: Illegal mix of collations (utf8mb3_general_ci,IMPLICIT) and (utf32_general_ci,IMPLICIT) for operation 'concat' +ERROR HY000: Illegal mix of collations (utf8mb3_uca1400_ai_ci,IMPLICIT) and (utf32_uca1400_ai_ci,IMPLICIT) for operation 'concat' SELECT CHARSET(CONCAT(utf8mb4, utf8)) FROM t1; CHARSET(CONCAT(utf8mb4, utf8)) utf8mb4 SELECT CHARSET(CONCAT(utf8mb4, ucs2)) FROM t1; -ERROR HY000: Illegal mix of collations (utf8mb4_general_ci,IMPLICIT) and (ucs2_general_ci,IMPLICIT) for operation 'concat' +ERROR HY000: Illegal mix of collations (utf8mb4_uca1400_ai_ci,IMPLICIT) and (ucs2_uca1400_ai_ci,IMPLICIT) for operation 'concat' SELECT CHARSET(CONCAT(utf8mb4, utf16)) FROM t1; -ERROR HY000: Illegal mix of collations (utf8mb4_general_ci,IMPLICIT) and (utf16_general_ci,IMPLICIT) for operation 'concat' +ERROR HY000: Illegal mix of collations (utf8mb4_uca1400_ai_ci,IMPLICIT) and (utf16_uca1400_ai_ci,IMPLICIT) for operation 'concat' SELECT CHARSET(CONCAT(utf8mb4, utf32)) FROM t1; -ERROR HY000: Illegal mix of collations (utf8mb4_general_ci,IMPLICIT) and (utf32_general_ci,IMPLICIT) for operation 'concat' +ERROR HY000: Illegal mix of collations (utf8mb4_uca1400_ai_ci,IMPLICIT) and (utf32_uca1400_ai_ci,IMPLICIT) for operation 'concat' SELECT CHARSET(CONCAT(ucs2, utf8)) FROM t1; -ERROR HY000: Illegal mix of collations (ucs2_general_ci,IMPLICIT) and (utf8mb3_general_ci,IMPLICIT) for operation 'concat' +ERROR HY000: Illegal mix of collations (ucs2_uca1400_ai_ci,IMPLICIT) and (utf8mb3_uca1400_ai_ci,IMPLICIT) for operation 'concat' SELECT CHARSET(CONCAT(ucs2, utf8mb4)) FROM t1; -ERROR HY000: Illegal mix of collations (ucs2_general_ci,IMPLICIT) and (utf8mb4_general_ci,IMPLICIT) for operation 'concat' +ERROR HY000: Illegal mix of collations (ucs2_uca1400_ai_ci,IMPLICIT) and (utf8mb4_uca1400_ai_ci,IMPLICIT) for operation 'concat' SELECT CHARSET(CONCAT(ucs2, utf16)) FROM t1; -ERROR HY000: Illegal mix of collations (ucs2_general_ci,IMPLICIT) and (utf16_general_ci,IMPLICIT) for operation 'concat' +ERROR HY000: Illegal mix of collations (ucs2_uca1400_ai_ci,IMPLICIT) and (utf16_uca1400_ai_ci,IMPLICIT) for operation 'concat' SELECT CHARSET(CONCAT(ucs2, utf32)) FROM t1; -ERROR HY000: Illegal mix of collations (ucs2_general_ci,IMPLICIT) and (utf32_general_ci,IMPLICIT) for operation 'concat' +ERROR HY000: Illegal mix of collations (ucs2_uca1400_ai_ci,IMPLICIT) and (utf32_uca1400_ai_ci,IMPLICIT) for operation 'concat' SELECT CHARSET(CONCAT(utf16, utf8)) FROM t1; -ERROR HY000: Illegal mix of collations (utf16_general_ci,IMPLICIT) and (utf8mb3_general_ci,IMPLICIT) for operation 'concat' +ERROR HY000: Illegal mix of collations (utf16_uca1400_ai_ci,IMPLICIT) and (utf8mb3_uca1400_ai_ci,IMPLICIT) for operation 'concat' SELECT CHARSET(CONCAT(utf16, ucs2)) FROM t1; -ERROR HY000: Illegal mix of collations (utf16_general_ci,IMPLICIT) and (ucs2_general_ci,IMPLICIT) for operation 'concat' +ERROR HY000: Illegal mix of collations (utf16_uca1400_ai_ci,IMPLICIT) and (ucs2_uca1400_ai_ci,IMPLICIT) for operation 'concat' SELECT CHARSET(CONCAT(utf16, utf8mb4)) FROM t1; -ERROR HY000: Illegal mix of collations (utf16_general_ci,IMPLICIT) and (utf8mb4_general_ci,IMPLICIT) for operation 'concat' +ERROR HY000: Illegal mix of collations (utf16_uca1400_ai_ci,IMPLICIT) and (utf8mb4_uca1400_ai_ci,IMPLICIT) for operation 'concat' SELECT CHARSET(CONCAT(utf16, utf32)) FROM t1; -ERROR HY000: Illegal mix of collations (utf16_general_ci,IMPLICIT) and (utf32_general_ci,IMPLICIT) for operation 'concat' +ERROR HY000: Illegal mix of collations (utf16_uca1400_ai_ci,IMPLICIT) and (utf32_uca1400_ai_ci,IMPLICIT) for operation 'concat' SELECT CHARSET(CONCAT(utf32, utf8)) FROM t1; -ERROR HY000: Illegal mix of collations (utf32_general_ci,IMPLICIT) and (utf8mb3_general_ci,IMPLICIT) for operation 'concat' +ERROR HY000: Illegal mix of collations (utf32_uca1400_ai_ci,IMPLICIT) and (utf8mb3_uca1400_ai_ci,IMPLICIT) for operation 'concat' SELECT CHARSET(CONCAT(utf32, ucs2)) FROM t1; -ERROR HY000: Illegal mix of collations (utf32_general_ci,IMPLICIT) and (ucs2_general_ci,IMPLICIT) for operation 'concat' +ERROR HY000: Illegal mix of collations (utf32_uca1400_ai_ci,IMPLICIT) and (ucs2_uca1400_ai_ci,IMPLICIT) for operation 'concat' SELECT CHARSET(CONCAT(utf32, utf8mb4)) FROM t1; -ERROR HY000: Illegal mix of collations (utf32_general_ci,IMPLICIT) and (utf8mb4_general_ci,IMPLICIT) for operation 'concat' +ERROR HY000: Illegal mix of collations (utf32_uca1400_ai_ci,IMPLICIT) and (utf8mb4_uca1400_ai_ci,IMPLICIT) for operation 'concat' SELECT CHARSET(CONCAT(utf32, utf16)) FROM t1; -ERROR HY000: Illegal mix of collations (utf32_general_ci,IMPLICIT) and (utf16_general_ci,IMPLICIT) for operation 'concat' +ERROR HY000: Illegal mix of collations (utf32_uca1400_ai_ci,IMPLICIT) and (utf16_uca1400_ai_ci,IMPLICIT) for operation 'concat' DROP TABLE t1; # # Bug#58321 No warning when characters outside BMP0 is converted to UCS2 diff --git a/mysql-test/main/ctype_many.test b/mysql-test/main/ctype_many.test index ba99c2e925a..9d02b433e9e 100644 --- a/mysql-test/main/ctype_many.test +++ b/mysql-test/main/ctype_many.test @@ -145,7 +145,7 @@ INSERT INTO t1 (koi8_ru_f,comment) VALUES (_koi8r' SET CHARACTER SET utf8; SELECT koi8_ru_f,MIN(comment),COUNT(*) FROM t1 GROUP BY 1; -ALTER TABLE t1 ADD utf8_f CHAR(32) CHARACTER SET utf8 NOT NULL default ''; +ALTER TABLE t1 ADD utf8_f CHAR(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL default ''; UPDATE t1 SET utf8_f=CONVERT(koi8_ru_f USING utf8); SET CHARACTER SET koi8r; SELECT * FROM t1; diff --git a/mysql-test/main/ctype_mb.result b/mysql-test/main/ctype_mb.result index 67aedbf209e..dc3a9617511 100644 --- a/mysql-test/main/ctype_mb.result +++ b/mysql-test/main/ctype_mb.result @@ -3,17 +3,17 @@ CREATE TABLE t1 SELECT _utf8'test' as c1, _utf8'тест' as c2; SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` varchar(4) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL, - `c2` varchar(4) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL + `c1` varchar(4) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci NOT NULL, + `c2` varchar(4) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci NOT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DELETE FROM t1; ALTER TABLE t1 ADD c3 CHAR(4) CHARACTER SET utf8; SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` varchar(4) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL, - `c2` varchar(4) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL, - `c3` char(4) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL + `c1` varchar(4) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci NOT NULL, + `c2` varchar(4) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci NOT NULL, + `c3` char(4) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci INSERT IGNORE INTO t1 VALUES ('aaaabbbbccccdddd','aaaabbbbccccdddd','aaaabbbbccccdddd'); Warnings: @@ -28,7 +28,7 @@ CREATE TABLE t1 (a CHAR(4) CHARACTER SET utf8, KEY key_a(a(3))); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` char(4) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL, + `a` char(4) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL, KEY `key_a` (`a`(3)) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SHOW KEYS FROM t1; @@ -48,7 +48,7 @@ ALTER TABLE t1 CHANGE a a CHAR(4) CHARACTER SET utf8; SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` char(4) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL, + `a` char(4) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL, KEY `key_a` (`a`(3)) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SHOW KEYS FROM t1; diff --git a/mysql-test/main/ctype_uca.result b/mysql-test/main/ctype_uca.result index f9b831176f8..abc9c3f5c1d 100644 --- a/mysql-test/main/ctype_uca.result +++ b/mysql-test/main/ctype_uca.result @@ -6479,6 +6479,9 @@ c ch drop table t1; set collation_connection=ucs2_unicode_ci; +# +# Bug#31081 server crash in regexp function +# drop table if exists t1; create table t1 as select repeat(' ', 64) as s1, repeat(' ',64) as s2 diff --git a/mysql-test/main/ctype_ucs.result b/mysql-test/main/ctype_ucs.result index 8be4ca24dda..9645d352e24 100644 --- a/mysql-test/main/ctype_ucs.result +++ b/mysql-test/main/ctype_ucs.result @@ -145,7 +145,7 @@ hex(a) 00410009 0041005A drop table t1; -CREATE TABLE t1 (word VARCHAR(64) CHARACTER SET ucs2, word2 CHAR(64) CHARACTER SET ucs2); +CREATE TABLE t1 (word VARCHAR(64), word2 CHAR(64)) CHARACTER SET ucs2 COLLATE ucs2_general_ci; INSERT INTO t1 VALUES (_koi8r'',_koi8r''), (X'2004',X'2004'); SELECT hex(word) FROM t1 ORDER BY word; hex(word) @@ -196,8 +196,8 @@ RPAD(_ucs2 X'0420',10,_ucs2 X'0421') r; SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `l` varchar(10) CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL, - `r` varchar(10) CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL + `l` varchar(10) CHARACTER SET ucs2 COLLATE ucs2_uca1400_ai_ci DEFAULT NULL, + `r` varchar(10) CHARACTER SET ucs2 COLLATE ucs2_uca1400_ai_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; # @@ -682,7 +682,7 @@ create table t1 (a enum('x','y','z') character set ucs2); show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` enum('x','y','z') CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL + `a` enum('x','y','z') CHARACTER SET ucs2 COLLATE ucs2_uca1400_ai_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci insert into t1 values ('x'); insert into t1 values ('y'); @@ -696,7 +696,7 @@ alter table t1 change a a enum('x','y','z','d','e',' show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` enum('x','y','z','d','e','','','') CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL + `a` enum('x','y','z','d','e','','','') CHARACTER SET ucs2 COLLATE ucs2_uca1400_ai_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci insert into t1 values ('D'); insert into t1 values ('E '); @@ -718,7 +718,7 @@ create table t1 (a set ('x','y','z',' show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` set('x','y','z','','','') CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL + `a` set('x','y','z','','','') CHARACTER SET ucs2 COLLATE ucs2_uca1400_ai_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci insert into t1 values ('x'); insert into t1 values ('y'); @@ -1364,7 +1364,7 @@ hex(group_concat(a)) 0061002C0062002C0063 select collation(group_concat(a)) from t1; collation(group_concat(a)) -ucs2_general_ci +ucs2_uca1400_ai_ci drop table t1; set names latin1; create table t1 (a char(1) character set latin1); @@ -1402,17 +1402,17 @@ a 1 select * from t1 where a=if(b>10,_ucs2 0x0061,_ucs2 0x0062); a b select concat(a,if(b<10,_ucs2 0x00C0,_ucs2 0x0062)) from t1; -ERROR HY000: Illegal mix of collations (ascii_general_ci,IMPLICIT) and (ucs2_general_ci,COERCIBLE) for operation 'concat' +ERROR HY000: Illegal mix of collations (ascii_general_ci,IMPLICIT) and (ucs2_uca1400_ai_ci,COERCIBLE) for operation 'concat' select concat(a,if(b>10,_ucs2 0x00C0,_ucs2 0x0062)) from t1; -ERROR HY000: Illegal mix of collations (ascii_general_ci,IMPLICIT) and (ucs2_general_ci,COERCIBLE) for operation 'concat' +ERROR HY000: Illegal mix of collations (ascii_general_ci,IMPLICIT) and (ucs2_uca1400_ai_ci,COERCIBLE) for operation 'concat' select concat(a,if(b<10,_ucs2 0x0062,_ucs2 0x00C0)) from t1; -ERROR HY000: Illegal mix of collations (ascii_general_ci,IMPLICIT) and (ucs2_general_ci,COERCIBLE) for operation 'concat' +ERROR HY000: Illegal mix of collations (ascii_general_ci,IMPLICIT) and (ucs2_uca1400_ai_ci,COERCIBLE) for operation 'concat' select concat(a,if(b>10,_ucs2 0x0062,_ucs2 0x00C0)) from t1; -ERROR HY000: Illegal mix of collations (ascii_general_ci,IMPLICIT) and (ucs2_general_ci,COERCIBLE) for operation 'concat' +ERROR HY000: Illegal mix of collations (ascii_general_ci,IMPLICIT) and (ucs2_uca1400_ai_ci,COERCIBLE) for operation 'concat' select * from t1 where a=if(b<10,_ucs2 0x00C0,_ucs2 0x0062); -ERROR HY000: Illegal mix of collations (ascii_general_ci,IMPLICIT) and (ucs2_general_ci,COERCIBLE) for operation '=' +ERROR HY000: Illegal mix of collations (ascii_general_ci,IMPLICIT) and (ucs2_uca1400_ai_ci,COERCIBLE) for operation '=' select * from t1 where a=if(b<10,_ucs2 0x0062,_ucs2 0x00C0); -ERROR HY000: Illegal mix of collations (ascii_general_ci,IMPLICIT) and (ucs2_general_ci,COERCIBLE) for operation '=' +ERROR HY000: Illegal mix of collations (ascii_general_ci,IMPLICIT) and (ucs2_uca1400_ai_ci,COERCIBLE) for operation '=' drop table t1; CREATE TABLE t1 (s1 CHAR(5) CHARACTER SET UCS2); INSERT INTO t1 VALUES ('a'); @@ -1426,6 +1426,9 @@ HEX(s1) 0061 DROP TABLE t1; set collation_connection=ucs2_general_ci; +# +# Bug#31081 server crash in regexp function +# drop table if exists t1; create table t1 as select repeat(' ', 64) as s1, repeat(' ',64) as s2 diff --git a/mysql-test/main/ctype_ucs.test b/mysql-test/main/ctype_ucs.test index c05f8d9b442..518a67cca85 100644 --- a/mysql-test/main/ctype_ucs.test +++ b/mysql-test/main/ctype_ucs.test @@ -34,7 +34,7 @@ drop table t1; # which contains 0x20 in the high byte. # -CREATE TABLE t1 (word VARCHAR(64) CHARACTER SET ucs2, word2 CHAR(64) CHARACTER SET ucs2); +CREATE TABLE t1 (word VARCHAR(64), word2 CHAR(64)) CHARACTER SET ucs2 COLLATE ucs2_general_ci; INSERT INTO t1 VALUES (_koi8r'',_koi8r''), (X'2004',X'2004'); SELECT hex(word) FROM t1 ORDER BY word; SELECT hex(word2) FROM t1 ORDER BY word2; diff --git a/mysql-test/main/ctype_utf16.result b/mysql-test/main/ctype_utf16.result index 21b55e558d9..5cd0fac64ce 100644 --- a/mysql-test/main/ctype_utf16.result +++ b/mysql-test/main/ctype_utf16.result @@ -38,7 +38,7 @@ hex(_utf16 0x3344) select hex(_utf16 0x113344); hex(_utf16 0x113344) 00113344 -CREATE TABLE t1 (word VARCHAR(64), word2 CHAR(64)) CHARACTER SET utf16; +CREATE TABLE t1 (word VARCHAR(64), word2 CHAR(64)) CHARACTER SET utf16 COLLATE utf16_general_ci; INSERT INTO t1 VALUES (_koi8r 0xF2, _koi8r 0xF2), (X'2004',X'2004'); SELECT hex(word) FROM t1 ORDER BY word; hex(word) @@ -101,8 +101,8 @@ RPAD(_utf16 X'0420',10,_utf16 X'0421') r; SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `l` varchar(10) CHARACTER SET utf16 COLLATE utf16_general_ci DEFAULT NULL, - `r` varchar(10) CHARACTER SET utf16 COLLATE utf16_general_ci DEFAULT NULL + `l` varchar(10) CHARACTER SET utf16 COLLATE utf16_uca1400_ai_ci DEFAULT NULL, + `r` varchar(10) CHARACTER SET utf16 COLLATE utf16_uca1400_ai_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci select hex(l), hex(r) from t1; hex(l) hex(r) @@ -510,7 +510,7 @@ create table t1 (a enum('x','y','z') character set utf16); show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` enum('x','y','z') CHARACTER SET utf16 COLLATE utf16_general_ci DEFAULT NULL + `a` enum('x','y','z') CHARACTER SET utf16 COLLATE utf16_uca1400_ai_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci insert into t1 values ('x'); insert into t1 values ('y'); @@ -524,7 +524,7 @@ alter table t1 change a a enum('x','y','z','d','e','ä','ö','ü') character set show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` enum('x','y','z','d','e','ä','ö','ü') CHARACTER SET utf16 COLLATE utf16_general_ci DEFAULT NULL + `a` enum('x','y','z','d','e','ä','ö','ü') CHARACTER SET utf16 COLLATE utf16_uca1400_ai_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci insert into t1 values ('D'); insert into t1 values ('E '); @@ -546,7 +546,7 @@ create table t1 (a set ('x','y','z','ä','ö','ü') character set utf16); show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` set('x','y','z','ä','ö','ü') CHARACTER SET utf16 COLLATE utf16_general_ci DEFAULT NULL + `a` set('x','y','z','ä','ö','ü') CHARACTER SET utf16 COLLATE utf16_uca1400_ai_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci insert into t1 values ('x'); insert into t1 values ('y'); @@ -1294,14 +1294,14 @@ Note 1246 Converting column 'a' from VARCHAR to TEXT show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` mediumtext CHARACTER SET utf16 COLLATE utf16_general_ci DEFAULT NULL + `a` mediumtext CHARACTER SET utf16 COLLATE utf16_uca1400_ai_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop table t1; create table t1 (a varchar(250) character set utf16 primary key); show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` varchar(250) CHARACTER SET utf16 COLLATE utf16_general_ci NOT NULL, + `a` varchar(250) CHARACTER SET utf16 COLLATE utf16_uca1400_ai_ci NOT NULL, PRIMARY KEY (`a`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop table t1; @@ -1322,6 +1322,9 @@ E000 EE8080 E000 FFFF EFBFBF FFFF drop table t1; set collation_connection=utf16_general_ci; +# +# Bug#31081 server crash in regexp function +# drop table if exists t1; create table t1 as select repeat(' ', 64) as s1, repeat(' ',64) as s2 @@ -1515,11 +1518,11 @@ s4 LONGTEXT CHARACTER SET utf16 SET NAMES utf8, @@character_set_results=NULL; SELECT *, HEX(s1) FROM t1; Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr -def test t1 t1 s1 s1 252 255 0 Y 16 0 54 -def test t1 t1 s2 s2 252 65535 0 Y 16 0 54 -def test t1 t1 s3 s3 252 16777215 0 Y 16 0 54 -def test t1 t1 s4 s4 252 4294967295 0 Y 16 0 54 -def HEX(s1) 253 6120 0 Y 0 0 33 +def test t1 t1 s1 s1 252 255 0 Y 16 0 101 +def test t1 t1 s2 s2 252 65535 0 Y 16 0 101 +def test t1 t1 s3 s3 252 16777215 0 Y 16 0 101 +def test t1 t1 s4 s4 252 4294967295 0 Y 16 0 101 +def HEX(s1) 253 6120 0 Y 0 0 192 s1 s2 s3 s4 HEX(s1) SET NAMES latin1; SELECT *, HEX(s1) FROM t1; @@ -1533,17 +1536,17 @@ s1 s2 s3 s4 HEX(s1) SET NAMES utf8; SELECT *, HEX(s1) FROM t1; Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr -def test t1 t1 s1 s1 252 381 0 Y 16 0 33 -def test t1 t1 s2 s2 252 98301 0 Y 16 0 33 -def test t1 t1 s3 s3 252 25165821 0 Y 16 0 33 -def test t1 t1 s4 s4 252 4294967295 0 Y 16 0 33 -def HEX(s1) 253 6120 0 Y 0 0 33 +def test t1 t1 s1 s1 252 381 0 Y 16 0 192 +def test t1 t1 s2 s2 252 98301 0 Y 16 0 192 +def test t1 t1 s3 s3 252 25165821 0 Y 16 0 192 +def test t1 t1 s4 s4 252 4294967295 0 Y 16 0 192 +def HEX(s1) 253 6120 0 Y 0 0 192 s1 s2 s3 s4 HEX(s1) CREATE TABLE t2 AS SELECT CONCAT(s1) FROM t1; SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( - `CONCAT(s1)` varchar(255) CHARACTER SET utf16 COLLATE utf16_general_ci DEFAULT NULL + `CONCAT(s1)` varchar(255) CHARACTER SET utf16 COLLATE utf16_uca1400_ai_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1, t2; # @@ -1834,11 +1837,11 @@ hex(weight_string(cast(_latin1 0x808080 as char), 5, 4, 0xC0)) select hex(weight_string(cast(_latin1 0x808080 as char),25, 4, 0xC0)); hex(weight_string(cast(_latin1 0x808080 as char),25, 4, 0xC0)) 20AC20AC20AC00200020002000200020002000200020002000 -select hex(weight_string(_utf16 0xD800DC00)); -hex(weight_string(_utf16 0xD800DC00)) +select hex(weight_string(_utf16 0xD800DC00 COLLATE utf16_general_ci)); +hex(weight_string(_utf16 0xD800DC00 COLLATE utf16_general_ci)) FFFD -select hex(weight_string(_utf16 0xD800DC01)); -hex(weight_string(_utf16 0xD800DC01)) +select hex(weight_string(_utf16 0xD800DC01 COLLATE utf16_general_ci)); +hex(weight_string(_utf16 0xD800DC01 COLLATE utf16_general_ci)) FFFD select @@collation_connection; @@collation_connection @@ -2190,7 +2193,8 @@ SET optimizer_switch=@save_optimizer_switch; # CREATE TABLE t1 ( id INT NOT NULL AUTO_INCREMENT PRIMARY KEY, -a VARCHAR(10) CHARACTER SET utf16, KEY(a,id) +a VARCHAR(10) CHARACTER SET utf16 COLLATE utf16_general_ci, +KEY(a,id) ); INSERT INTO t1 (a) VALUES (_utf8mb4 0x61); INSERT INTO t1 (a) VALUES (_utf8mb4 0xC280),(_utf8mb4 0xDFBF); diff --git a/mysql-test/main/ctype_utf16.test b/mysql-test/main/ctype_utf16.test index 9f81f23a5b2..79c24ee3754 100644 --- a/mysql-test/main/ctype_utf16.test +++ b/mysql-test/main/ctype_utf16.test @@ -34,7 +34,7 @@ select hex(_utf16 0x113344); # low byte. The second character is THREE-PER-M, U+2004, # which contains 0x20 in the high byte. -CREATE TABLE t1 (word VARCHAR(64), word2 CHAR(64)) CHARACTER SET utf16; +CREATE TABLE t1 (word VARCHAR(64), word2 CHAR(64)) CHARACTER SET utf16 COLLATE utf16_general_ci; INSERT INTO t1 VALUES (_koi8r 0xF2, _koi8r 0xF2), (X'2004',X'2004'); SELECT hex(word) FROM t1 ORDER BY word; SELECT hex(word2) FROM t1 ORDER BY word2; @@ -830,8 +830,8 @@ SET NAMES utf8; set collation_connection=utf16_general_ci; --source include/weight_string.inc --source include/weight_string_euro.inc -select hex(weight_string(_utf16 0xD800DC00)); -select hex(weight_string(_utf16 0xD800DC01)); +select hex(weight_string(_utf16 0xD800DC00 COLLATE utf16_general_ci)); +select hex(weight_string(_utf16 0xD800DC01 COLLATE utf16_general_ci)); --source include/weight_string_l1.inc set collation_connection=utf16_bin; @@ -894,7 +894,8 @@ SET NAMES utf8, character_set_connection=utf16; --echo # CREATE TABLE t1 ( id INT NOT NULL AUTO_INCREMENT PRIMARY KEY, - a VARCHAR(10) CHARACTER SET utf16, KEY(a,id) + a VARCHAR(10) CHARACTER SET utf16 COLLATE utf16_general_ci, + KEY(a,id) ); INSERT INTO t1 (a) VALUES (_utf8mb4 0x61); INSERT INTO t1 (a) VALUES (_utf8mb4 0xC280),(_utf8mb4 0xDFBF); diff --git a/mysql-test/main/ctype_utf16_uca.result b/mysql-test/main/ctype_utf16_uca.result index 69ebfc4de54..99a8526c700 100644 --- a/mysql-test/main/ctype_utf16_uca.result +++ b/mysql-test/main/ctype_utf16_uca.result @@ -3108,6 +3108,9 @@ COUNT(*) c1 1 a DROP TABLE IF EXISTS t1; set collation_connection=utf16_unicode_ci; +# +# Bug#31081 server crash in regexp function +# drop table if exists t1; create table t1 as select repeat(' ', 64) as s1, repeat(' ',64) as s2 diff --git a/mysql-test/main/ctype_utf16le.result b/mysql-test/main/ctype_utf16le.result index e5b07ef1767..991968dd3dc 100644 --- a/mysql-test/main/ctype_utf16le.result +++ b/mysql-test/main/ctype_utf16le.result @@ -1592,6 +1592,9 @@ DROP TABLE t1; # Test basic regex functionality # SET NAMES utf8, collation_connection=utf16le_general_ci; +# +# Bug#31081 server crash in regexp function +# drop table if exists t1; create table t1 as select repeat(' ', 64) as s1, repeat(' ',64) as s2 @@ -1791,7 +1794,7 @@ def test t1 t1 s1 s1 252 255 0 Y 16 0 56 def test t1 t1 s2 s2 252 65535 0 Y 16 0 56 def test t1 t1 s3 s3 252 16777215 0 Y 16 0 56 def test t1 t1 s4 s4 252 4294967295 0 Y 16 0 56 -def HEX(s1) 253 6120 0 Y 0 0 33 +def HEX(s1) 253 6120 0 Y 0 0 192 s1 s2 s3 s4 HEX(s1) SET NAMES latin1; SELECT *, HEX(s1) FROM t1; @@ -1805,11 +1808,11 @@ s1 s2 s3 s4 HEX(s1) SET NAMES utf8; SELECT *, HEX(s1) FROM t1; Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr -def test t1 t1 s1 s1 252 381 0 Y 16 0 33 -def test t1 t1 s2 s2 252 98301 0 Y 16 0 33 -def test t1 t1 s3 s3 252 25165821 0 Y 16 0 33 -def test t1 t1 s4 s4 252 4294967295 0 Y 16 0 33 -def HEX(s1) 253 6120 0 Y 0 0 33 +def test t1 t1 s1 s1 252 381 0 Y 16 0 192 +def test t1 t1 s2 s2 252 98301 0 Y 16 0 192 +def test t1 t1 s3 s3 252 25165821 0 Y 16 0 192 +def test t1 t1 s4 s4 252 4294967295 0 Y 16 0 192 +def HEX(s1) 253 6120 0 Y 0 0 192 s1 s2 s3 s4 HEX(s1) CREATE TABLE t2 AS SELECT CONCAT(s1) FROM t1; SHOW CREATE TABLE t2; diff --git a/mysql-test/main/ctype_utf32.result b/mysql-test/main/ctype_utf32.result index ef8feeab49a..ad25f34f4d2 100644 --- a/mysql-test/main/ctype_utf32.result +++ b/mysql-test/main/ctype_utf32.result @@ -47,7 +47,7 @@ hex(_utf32 X'3344') select hex(_utf32 X'103344'); hex(_utf32 X'103344') 00103344 -CREATE TABLE t1 (word VARCHAR(64), word2 CHAR(64)) CHARACTER SET utf32; +CREATE TABLE t1 (word VARCHAR(64), word2 CHAR(64)) CHARACTER SET utf32 COLLATE utf32_general_ci; INSERT INTO t1 VALUES (_koi8r 0xF2, _koi8r 0xF2), (X'2004',X'2004'); SELECT hex(word) FROM t1 ORDER BY word; hex(word) @@ -100,8 +100,8 @@ RPAD(_utf32 X'0420',10,_utf32 X'0421') r; SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `l` varchar(10) CHARACTER SET utf32 COLLATE utf32_general_ci DEFAULT NULL, - `r` varchar(10) CHARACTER SET utf32 COLLATE utf32_general_ci DEFAULT NULL + `l` varchar(10) CHARACTER SET utf32 COLLATE utf32_uca1400_ai_ci DEFAULT NULL, + `r` varchar(10) CHARACTER SET utf32 COLLATE utf32_uca1400_ai_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci select hex(l), hex(r) from t1; hex(l) hex(r) @@ -240,7 +240,7 @@ select 'AMZ'like 'A%M%Z'; 1 SET NAMES utf8; SET character_set_connection=utf32; -CREATE TABLE t1 (a VARCHAR(10) CHARACTER SET utf32); +CREATE TABLE t1 (a VARCHAR(10) CHARACTER SET utf32 COLLATE utf32_general_ci); INSERT INTO t1 VALUES ('фыва'),('Фыва'),('фЫва'),('фыВа'),('фывА'),('ФЫВА'); INSERT INTO t1 VALUES ('фывапролдж'),('Фывапролдж'),('фЫвапролдж'),('фыВапролдж'); INSERT INTO t1 VALUES ('фывАпролдж'),('фываПролдж'),('фывапРолдж'),('фывапрОлдж'); @@ -509,7 +509,7 @@ create table t1 (a enum('x','y','z') character set utf32); show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` enum('x','y','z') CHARACTER SET utf32 COLLATE utf32_general_ci DEFAULT NULL + `a` enum('x','y','z') CHARACTER SET utf32 COLLATE utf32_uca1400_ai_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci insert into t1 values ('x'); insert into t1 values ('y'); @@ -523,7 +523,7 @@ alter table t1 change a a enum('x','y','z','d','e','ä','ö','ü') character set show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` enum('x','y','z','d','e','ä','ö','ü') CHARACTER SET utf32 COLLATE utf32_general_ci DEFAULT NULL + `a` enum('x','y','z','d','e','ä','ö','ü') CHARACTER SET utf32 COLLATE utf32_uca1400_ai_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci insert into t1 values ('D'); insert into t1 values ('E '); @@ -545,7 +545,7 @@ create table t1 (a set ('x','y','z','ä','ö','ü') character set utf32); show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` set('x','y','z','ä','ö','ü') CHARACTER SET utf32 COLLATE utf32_general_ci DEFAULT NULL + `a` set('x','y','z','ä','ö','ü') CHARACTER SET utf32 COLLATE utf32_uca1400_ai_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci insert into t1 values ('x'); insert into t1 values ('y'); @@ -1291,14 +1291,14 @@ Note 1246 Converting column 'a' from VARCHAR to TEXT show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` mediumtext CHARACTER SET utf32 COLLATE utf32_general_ci DEFAULT NULL + `a` mediumtext CHARACTER SET utf32 COLLATE utf32_uca1400_ai_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop table t1; create table t1 (a varchar(250) character set utf32 primary key); show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` varchar(250) CHARACTER SET utf32 COLLATE utf32_general_ci NOT NULL, + `a` varchar(250) CHARACTER SET utf32 COLLATE utf32_uca1400_ai_ci NOT NULL, PRIMARY KEY (`a`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop table t1; @@ -1425,6 +1425,9 @@ t DROP TABLE t1; SET NAMES latin1; set collation_connection=utf32_general_ci; +# +# Bug#31081 server crash in regexp function +# drop table if exists t1; create table t1 as select repeat(' ', 64) as s1, repeat(' ',64) as s2 @@ -1528,11 +1531,11 @@ s4 LONGTEXT CHARACTER SET utf32 SET NAMES utf8mb4, @@character_set_results=NULL; SELECT *, HEX(s1) FROM t1; Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr -def test t1 t1 s1 s1 252 255 0 Y 16 0 60 -def test t1 t1 s2 s2 252 65535 0 Y 16 0 60 -def test t1 t1 s3 s3 252 16777215 0 Y 16 0 60 -def test t1 t1 s4 s4 252 4294967295 0 Y 16 0 60 -def HEX(s1) 253 8160 0 Y 0 0 45 +def test t1 t1 s1 s1 252 255 0 Y 16 0 160 +def test t1 t1 s2 s2 252 65535 0 Y 16 0 160 +def test t1 t1 s3 s3 252 16777215 0 Y 16 0 160 +def test t1 t1 s4 s4 252 4294967295 0 Y 16 0 160 +def HEX(s1) 253 8160 0 Y 0 0 224 s1 s2 s3 s4 HEX(s1) SET NAMES latin1; SELECT *, HEX(s1) FROM t1; @@ -1546,17 +1549,17 @@ s1 s2 s3 s4 HEX(s1) SET NAMES utf8mb4; SELECT *, HEX(s1) FROM t1; Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr -def test t1 t1 s1 s1 252 252 0 Y 16 0 45 -def test t1 t1 s2 s2 252 65532 0 Y 16 0 45 -def test t1 t1 s3 s3 252 16777212 0 Y 16 0 45 -def test t1 t1 s4 s4 252 4294967292 0 Y 16 0 45 -def HEX(s1) 253 8160 0 Y 0 0 45 +def test t1 t1 s1 s1 252 252 0 Y 16 0 224 +def test t1 t1 s2 s2 252 65532 0 Y 16 0 224 +def test t1 t1 s3 s3 252 16777212 0 Y 16 0 224 +def test t1 t1 s4 s4 252 4294967292 0 Y 16 0 224 +def HEX(s1) 253 8160 0 Y 0 0 224 s1 s2 s3 s4 HEX(s1) CREATE TABLE t2 AS SELECT CONCAT(s1) FROM t1; SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( - `CONCAT(s1)` varchar(255) CHARACTER SET utf32 COLLATE utf32_general_ci DEFAULT NULL + `CONCAT(s1)` varchar(255) CHARACTER SET utf32 COLLATE utf32_uca1400_ai_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1, t2; # @@ -1933,11 +1936,11 @@ hex(weight_string(cast(_latin1 0x808080 as char), 5, 4, 0xC0)) select hex(weight_string(cast(_latin1 0x808080 as char),25, 4, 0xC0)); hex(weight_string(cast(_latin1 0x808080 as char),25, 4, 0xC0)) 20AC20AC20AC00200020002000200020002000200020002000 -select hex(weight_string(_utf32 0x10000)); -hex(weight_string(_utf32 0x10000)) +select hex(weight_string(_utf32 0x10000 collate utf32_general_ci)); +hex(weight_string(_utf32 0x10000 collate utf32_general_ci)) FFFD -select hex(weight_string(_utf32 0x10001)); -hex(weight_string(_utf32 0x10001)) +select hex(weight_string(_utf32 0x10001 collate utf32_general_ci)); +hex(weight_string(_utf32 0x10001 collate utf32_general_ci)) FFFD select @@collation_connection; @@collation_connection @@ -2287,14 +2290,14 @@ SET optimizer_switch=@save_optimizer_switch; # # MDEV-8419 utf32: compare broken bytes as "greater than any non-broken character" # -CREATE TABLE t1 (a VARCHAR(10) CHARACTER SET utf32, KEY(a)); +CREATE TABLE t1 (a VARCHAR(10) CHARACTER SET utf32 COLLATE utf32_general_ci, KEY(a)); INSERT INTO t1 VALUES (0x10000),(0x10001),(0x10002); SELECT COUNT(DISTINCT a) FROM t1; COUNT(DISTINCT a) 1 DROP TABLE t1; -SELECT _utf32 0x10001=_utf32 0x10002; -_utf32 0x10001=_utf32 0x10002 +SELECT _utf32 0x10001=_utf32 0x10002 COLLATE utf32_general_ci; +_utf32 0x10001=_utf32 0x10002 COLLATE utf32_general_ci 1 # # MDEV-9178 Wrong result for CAST(CONVERT('1IJ3' USING ucs2) AS SIGNED) @@ -3141,13 +3144,13 @@ ALTER TABLE t1 CHANGE a a ENUM('aa') CHARACTER SET utf32; SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` enum('慡') CHARACTER SET utf32 COLLATE utf32_general_ci DEFAULT NULL + `a` enum('慡') CHARACTER SET utf32 COLLATE utf32_uca1400_ai_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 CHANGE a a ENUM('a','b') CHARACTER SET utf32; SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` enum('a','b') CHARACTER SET utf32 COLLATE utf32_general_ci DEFAULT NULL + `a` enum('a','b') CHARACTER SET utf32 COLLATE utf32_uca1400_ai_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SET NAMES utf8; @@ -3161,8 +3164,8 @@ c2 ENUM ('a','b') CHARACTER SET utf32 DEFAULT 'a' SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` enum('a','b') CHARACTER SET utf32 COLLATE utf32_general_ci DEFAULT 'a', - `c2` enum('a','b') CHARACTER SET utf32 COLLATE utf32_general_ci DEFAULT 'a' + `c1` enum('a','b') CHARACTER SET utf32 COLLATE utf32_uca1400_ai_ci DEFAULT 'a', + `c2` enum('a','b') CHARACTER SET utf32 COLLATE utf32_uca1400_ai_ci DEFAULT 'a' ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 ( diff --git a/mysql-test/main/ctype_utf32.test b/mysql-test/main/ctype_utf32.test index 52071325199..e4ebcb7e4cd 100644 --- a/mysql-test/main/ctype_utf32.test +++ b/mysql-test/main/ctype_utf32.test @@ -40,7 +40,7 @@ select hex(_utf32 X'103344'); # which contains 0x20 in the high byte. # -CREATE TABLE t1 (word VARCHAR(64), word2 CHAR(64)) CHARACTER SET utf32; +CREATE TABLE t1 (word VARCHAR(64), word2 CHAR(64)) CHARACTER SET utf32 COLLATE utf32_general_ci; INSERT INTO t1 VALUES (_koi8r 0xF2, _koi8r 0xF2), (X'2004',X'2004'); SELECT hex(word) FROM t1 ORDER BY word; SELECT hex(word2) FROM t1 ORDER BY word2; @@ -99,7 +99,7 @@ SET character_set_connection=utf32; SET NAMES utf8; SET character_set_connection=utf32; -CREATE TABLE t1 (a VARCHAR(10) CHARACTER SET utf32); +CREATE TABLE t1 (a VARCHAR(10) CHARACTER SET utf32 COLLATE utf32_general_ci); INSERT INTO t1 VALUES ('фыва'),('Фыва'),('фЫва'),('фыВа'),('фывА'),('ФЫВА'); INSERT INTO t1 VALUES ('фывапролдж'),('Фывапролдж'),('фЫвапролдж'),('фыВапролдж'); INSERT INTO t1 VALUES ('фывАпролдж'),('фываПролдж'),('фывапРолдж'),('фывапрОлдж'); @@ -950,8 +950,8 @@ set sql_mode=default; set collation_connection=utf32_general_ci; --source include/weight_string.inc --source include/weight_string_euro.inc -select hex(weight_string(_utf32 0x10000)); -select hex(weight_string(_utf32 0x10001)); +select hex(weight_string(_utf32 0x10000 collate utf32_general_ci)); +select hex(weight_string(_utf32 0x10001 collate utf32_general_ci)); --source include/weight_string_l1.inc set collation_connection=utf32_bin; @@ -1017,11 +1017,11 @@ SET NAMEs utf8, character_set_connection=utf32; --echo # MDEV-8419 utf32: compare broken bytes as "greater than any non-broken character" --echo # # Make sure that all non-BMP characters are compared as equal -CREATE TABLE t1 (a VARCHAR(10) CHARACTER SET utf32, KEY(a)); +CREATE TABLE t1 (a VARCHAR(10) CHARACTER SET utf32 COLLATE utf32_general_ci, KEY(a)); INSERT INTO t1 VALUES (0x10000),(0x10001),(0x10002); SELECT COUNT(DISTINCT a) FROM t1; DROP TABLE t1; -SELECT _utf32 0x10001=_utf32 0x10002; +SELECT _utf32 0x10001=_utf32 0x10002 COLLATE utf32_general_ci; --echo # --echo # MDEV-9178 Wrong result for CAST(CONVERT('1IJ3' USING ucs2) AS SIGNED) diff --git a/mysql-test/main/ctype_utf32_uca.result b/mysql-test/main/ctype_utf32_uca.result index 5468beafd32..7a5cef53e22 100644 --- a/mysql-test/main/ctype_utf32_uca.result +++ b/mysql-test/main/ctype_utf32_uca.result @@ -3108,6 +3108,9 @@ COUNT(*) c1 1 a DROP TABLE IF EXISTS t1; set collation_connection=utf32_unicode_ci; +# +# Bug#31081 server crash in regexp function +# drop table if exists t1; create table t1 as select repeat(' ', 64) as s1, repeat(' ',64) as s2 @@ -7951,7 +7954,7 @@ ALTER TABLE t1 CHANGE a a ENUM('a','b') CHARACTER SET utf32; SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` enum('a','b') CHARACTER SET utf32 COLLATE utf32_general_ci DEFAULT NULL + `a` enum('a','b') CHARACTER SET utf32 COLLATE utf32_uca1400_ai_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SET NAMES utf8; diff --git a/mysql-test/main/ctype_utf8.result b/mysql-test/main/ctype_utf8.result index c8755c47f89..93e5889e505 100644 --- a/mysql-test/main/ctype_utf8.result +++ b/mysql-test/main/ctype_utf8.result @@ -1,4 +1,8 @@ SET TIME_ZONE='+03:00'; +SET character_set_collations= REGEXP_REPLACE(@@character_set_collations, '(utf8mb3=[a-z0-9_]*)', ''); +SELECT @@character_set_collations; +@@character_set_collations +ucs2=ucs2_uca1400_ai_ci,utf8mb4=utf8mb4_uca1400_ai_ci,utf16=utf16_uca1400_ai_ci,utf32=utf32_uca1400_ai_ci drop table if exists t1,t2,t3,t4; drop database if exists mysqltest; drop table if exists t1,t2; @@ -75,45 +79,6 @@ CONVERT(_koi8r'\xD7\xC1\xD3\xD1' USING utf8) LIKE CONVERT(_koi8r'\xF7\xE1\xF3\xF select CONVERT(_koi8r'' USING utf8) LIKE CONVERT(_koi8r'' USING utf8); CONVERT(_koi8r'\xF7\xE1\xF3\xF1' USING utf8) LIKE CONVERT(_koi8r'\xD7\xC1\xD3\xD1' USING utf8) 1 -SELECT 'a' = 'a '; -'a' = 'a ' -1 -SELECT 'a\0' < 'a'; -'a\0' < 'a' -1 -SELECT 'a\0' < 'a '; -'a\0' < 'a ' -1 -SELECT 'a\t' < 'a'; -'a\t' < 'a' -1 -SELECT 'a\t' < 'a '; -'a\t' < 'a ' -1 -SELECT 'a' = 'a ' collate utf8_bin; -'a' = 'a ' collate utf8_bin -1 -SELECT 'a\0' < 'a' collate utf8_bin; -'a\0' < 'a' collate utf8_bin -1 -SELECT 'a\0' < 'a ' collate utf8_bin; -'a\0' < 'a ' collate utf8_bin -1 -SELECT 'a\t' < 'a' collate utf8_bin; -'a\t' < 'a' collate utf8_bin -1 -SELECT 'a\t' < 'a ' collate utf8_bin; -'a\t' < 'a ' collate utf8_bin -1 -CREATE TABLE t1 (a char(10) character set utf8 not null); -INSERT INTO t1 VALUES ('a'),('a\0'),('a\t'),('a '); -SELECT hex(a),STRCMP(a,'a'), STRCMP(a,'a ') FROM t1; -hex(a) STRCMP(a,'a') STRCMP(a,'a ') -61 0 0 -6100 -1 -1 -6109 -1 -1 -61 0 0 -DROP TABLE t1; select insert('txs',2,1,'hi'),insert('is ',4,0,'a'),insert('txxxxt',2,4,'es'); insert('txs',2,1,'hi') insert('is ',4,0,'a') insert('txxxxt',2,4,'es') this is test @@ -270,95 +235,6 @@ b select * from t1 where a = 'b' and a != 'b'; a drop table t1; -set names utf8; -drop table if exists t1; -create table t1 as -select repeat(' ', 64) as s1, repeat(' ',64) as s2 -union -select null, null; -show create table t1; -Table Create Table -t1 CREATE TABLE `t1` ( - `s1` varchar(64) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL, - `s2` varchar(64) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci -delete from t1; -insert into t1 values('aaa','aaa'); -insert into t1 values('aaa|qqq','qqq'); -insert into t1 values('gheis','^[^a-dXYZ]+$'); -insert into t1 values('aab','^aa?b'); -insert into t1 values('Baaan','^Ba*n'); -insert into t1 values('aaa','qqq|aaa'); -insert into t1 values('qqq','qqq|aaa'); -insert into t1 values('bbb','qqq|aaa'); -insert into t1 values('bbb','qqq'); -insert into t1 values('aaa','aba'); -insert into t1 values(null,'abc'); -insert into t1 values('def',null); -insert into t1 values(null,null); -insert into t1 values('ghi','ghi['); -select HIGH_PRIORITY s1 regexp s2 from t1; -s1 regexp s2 -0 -0 -0 -1 -1 -1 -1 -1 -1 -1 -NULL -NULL -NULL -NULL -drop table t1; -SELECT @@character_set_client, @@collation_connection; -@@character_set_client @@collation_connection -utf8mb3 utf8mb3_general_ci -select 'вася' rlike '\\bвася\\b'; -'вася' rlike '\\bвася\\b' -1 -select 'вася ' rlike '\\bвася\\b'; -'вася ' rlike '\\bвася\\b' -1 -select ' вася' rlike '\\bвася\\b'; -' вася' rlike '\\bвася\\b' -1 -select ' вася ' rlike '\\bвася\\b'; -' вася ' rlike '\\bвася\\b' -1 -select 'вася' rlike '[[:<:]]вася[[:>:]]'; -'вася' rlike '[[:<:]]вася[[:>:]]' -1 -select 'вася ' rlike '[[:<:]]вася[[:>:]]'; -'вася ' rlike '[[:<:]]вася[[:>:]]' -1 -select ' вася' rlike '[[:<:]]вася[[:>:]]'; -' вася' rlike '[[:<:]]вася[[:>:]]' -1 -select ' вася ' rlike '[[:<:]]вася[[:>:]]'; -' вася ' rlike '[[:<:]]вася[[:>:]]' -1 -select 'васяz' rlike '\\bвася\\b'; -'васяz' rlike '\\bвася\\b' -0 -select 'zвася' rlike '\\bвася\\b'; -'zвася' rlike '\\bвася\\b' -0 -select 'zвасяz' rlike '\\bвася\\b'; -'zвасяz' rlike '\\bвася\\b' -0 -select 'васяz' rlike '[[:<:]]вася[[:>:]]'; -'васяz' rlike '[[:<:]]вася[[:>:]]' -0 -select 'zвася' rlike '[[:<:]]вася[[:>:]]'; -'zвася' rlike '[[:<:]]вася[[:>:]]' -0 -select 'zвасяz' rlike '[[:<:]]вася[[:>:]]'; -'zвасяz' rlike '[[:<:]]вася[[:>:]]' -0 CREATE TABLE t1 (a enum ('Y', 'N') DEFAULT 'N' COLLATE utf8_unicode_ci); ALTER TABLE t1 ADD COLUMN b CHAR(20); DROP TABLE t1; @@ -1819,7 +1695,7 @@ SET CHARACTER SET utf8; SHOW VARIABLES LIKE 'character\_set\_%'; Variable_name Value character_set_client utf8mb3 -character_set_collations +character_set_collations ucs2=ucs2_uca1400_ai_ci,utf8mb4=utf8mb4_uca1400_ai_ci,utf16=utf16_uca1400_ai_ci,utf32=utf32_uca1400_ai_ci character_set_connection latin1 character_set_database latin1 character_set_filesystem binary @@ -6270,494 +6146,6 @@ SET sql_mode=default; # # WL#3664 WEIGHT_STRING # -set names utf8; -select @@collation_connection; -@@collation_connection -utf8mb3_general_ci -CREATE TABLE t1 AS SELECT 'a' AS a; -SHOW CREATE TABLE t1; -Table Create Table -t1 CREATE TABLE `t1` ( - `a` varchar(1) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci -CREATE TABLE t2 AS SELECT WEIGHT_STRING(a) AS ws FROM t1; -SHOW CREATE TABLE t2; -Table Create Table -t2 CREATE TABLE `t2` ( - `ws` varbinary(2) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci -SELECT HEX(WEIGHT_STRING(a)) FROM t1; -HEX(WEIGHT_STRING(a)) -0041 -SELECT HEX(ws) FROM t2; -HEX(ws) -0041 -DROP TABLE t2; -DROP TABLE t1; -CREATE TABLE t1 AS SELECT REPEAT('a',5) AS a; -SHOW CREATE TABLE t1; -Table Create Table -t1 CREATE TABLE `t1` ( - `a` varchar(5) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci -CREATE TABLE t2 AS SELECT WEIGHT_STRING(a) AS ws FROM t1; -SHOW CREATE TABLE t2; -Table Create Table -t2 CREATE TABLE `t2` ( - `ws` varbinary(10) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci -SELECT HEX(WEIGHT_STRING(a)) FROM t1; -HEX(WEIGHT_STRING(a)) -00410041004100410041 -SELECT HEX(ws) FROM t2; -HEX(ws) -00410041004100410041 -DROP TABLE t2; -CREATE TABLE t2 AS SELECT WEIGHT_STRING(a AS CHAR(3)) AS ws FROM t1; -SHOW CREATE TABLE t2; -Table Create Table -t2 CREATE TABLE `t2` ( - `ws` varbinary(6) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci -SELECT HEX(WEIGHT_STRING(a AS CHAR(3))) FROM t1; -HEX(WEIGHT_STRING(a AS CHAR(3))) -004100410041 -SELECT HEX(ws) FROM t2; -HEX(ws) -004100410041 -DROP TABLE t2; -CREATE TABLE t2 AS SELECT WEIGHT_STRING(a AS CHAR(10)) AS ws FROM t1; -SHOW CREATE TABLE t2; -Table Create Table -t2 CREATE TABLE `t2` ( - `ws` varbinary(20) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci -SELECT HEX(WEIGHT_STRING(a AS CHAR(10))) FROM t1; -HEX(WEIGHT_STRING(a AS CHAR(10))) -0041004100410041004100200020002000200020 -SELECT HEX(ws) FROM t2; -HEX(ws) -0041004100410041004100200020002000200020 -DROP TABLE t2; -DROP TABLE t1; -select hex(weight_string('a')); -hex(weight_string('a')) -0041 -select hex(weight_string('A')); -hex(weight_string('A')) -0041 -select hex(weight_string('abc')); -hex(weight_string('abc')) -004100420043 -select hex(weight_string('abc' as char(2))); -hex(weight_string('abc' as char(2))) -00410042 -select hex(weight_string('abc' as char(3))); -hex(weight_string('abc' as char(3))) -004100420043 -select hex(weight_string('abc' as char(5))); -hex(weight_string('abc' as char(5))) -00410042004300200020 -select hex(weight_string('abc', 1, 2, 0xC0)); -hex(weight_string('abc', 1, 2, 0xC0)) -00 -select hex(weight_string('abc', 2, 2, 0xC0)); -hex(weight_string('abc', 2, 2, 0xC0)) -0041 -select hex(weight_string('abc', 3, 2, 0xC0)); -hex(weight_string('abc', 3, 2, 0xC0)) -004100 -select hex(weight_string('abc', 4, 2, 0xC0)); -hex(weight_string('abc', 4, 2, 0xC0)) -00410042 -select hex(weight_string('abc', 5, 2, 0xC0)); -hex(weight_string('abc', 5, 2, 0xC0)) -0041004200 -select hex(weight_string('abc',25, 2, 0xC0)); -hex(weight_string('abc',25, 2, 0xC0)) -00410042002000200020002000200020002000200020002000 -select hex(weight_string('abc', 1, 3, 0xC0)); -hex(weight_string('abc', 1, 3, 0xC0)) -00 -select hex(weight_string('abc', 2, 3, 0xC0)); -hex(weight_string('abc', 2, 3, 0xC0)) -0041 -select hex(weight_string('abc', 3, 3, 0xC0)); -hex(weight_string('abc', 3, 3, 0xC0)) -004100 -select hex(weight_string('abc', 4, 3, 0xC0)); -hex(weight_string('abc', 4, 3, 0xC0)) -00410042 -select hex(weight_string('abc', 5, 3, 0xC0)); -hex(weight_string('abc', 5, 3, 0xC0)) -0041004200 -select hex(weight_string('abc',25, 3, 0xC0)); -hex(weight_string('abc',25, 3, 0xC0)) -00410042004300200020002000200020002000200020002000 -select hex(weight_string('abc', 1, 4, 0xC0)); -hex(weight_string('abc', 1, 4, 0xC0)) -00 -select hex(weight_string('abc', 2, 4, 0xC0)); -hex(weight_string('abc', 2, 4, 0xC0)) -0041 -select hex(weight_string('abc', 3, 4, 0xC0)); -hex(weight_string('abc', 3, 4, 0xC0)) -004100 -select hex(weight_string('abc', 4, 4, 0xC0)); -hex(weight_string('abc', 4, 4, 0xC0)) -00410042 -select hex(weight_string('abc', 5, 4, 0xC0)); -hex(weight_string('abc', 5, 4, 0xC0)) -0041004200 -select hex(weight_string('abc',25, 4, 0xC0)); -hex(weight_string('abc',25, 4, 0xC0)) -00410042004300200020002000200020002000200020002000 -select @@collation_connection; -@@collation_connection -utf8mb3_general_ci -select hex(weight_string(cast(_latin1 0x80 as char))); -hex(weight_string(cast(_latin1 0x80 as char))) -20AC -select hex(weight_string(cast(_latin1 0x808080 as char))); -hex(weight_string(cast(_latin1 0x808080 as char))) -20AC20AC20AC -select hex(weight_string(cast(_latin1 0x808080 as char) as char(2))); -hex(weight_string(cast(_latin1 0x808080 as char) as char(2))) -20AC20AC -select hex(weight_string(cast(_latin1 0x808080 as char) as char(3))); -hex(weight_string(cast(_latin1 0x808080 as char) as char(3))) -20AC20AC20AC -select hex(weight_string(cast(_latin1 0x808080 as char) as char(5))); -hex(weight_string(cast(_latin1 0x808080 as char) as char(5))) -20AC20AC20AC00200020 -select hex(weight_string(cast(_latin1 0x808080 as char), 1, 2, 0xC0)); -hex(weight_string(cast(_latin1 0x808080 as char), 1, 2, 0xC0)) -20 -select hex(weight_string(cast(_latin1 0x808080 as char), 2, 2, 0xC0)); -hex(weight_string(cast(_latin1 0x808080 as char), 2, 2, 0xC0)) -20AC -select hex(weight_string(cast(_latin1 0x808080 as char), 3, 2, 0xC0)); -hex(weight_string(cast(_latin1 0x808080 as char), 3, 2, 0xC0)) -20AC20 -select hex(weight_string(cast(_latin1 0x808080 as char), 4, 2, 0xC0)); -hex(weight_string(cast(_latin1 0x808080 as char), 4, 2, 0xC0)) -20AC20AC -select hex(weight_string(cast(_latin1 0x808080 as char), 5, 2, 0xC0)); -hex(weight_string(cast(_latin1 0x808080 as char), 5, 2, 0xC0)) -20AC20AC00 -select hex(weight_string(cast(_latin1 0x808080 as char),25, 2, 0xC0)); -hex(weight_string(cast(_latin1 0x808080 as char),25, 2, 0xC0)) -20AC20AC002000200020002000200020002000200020002000 -select hex(weight_string(cast(_latin1 0x808080 as char), 1, 3, 0xC0)); -hex(weight_string(cast(_latin1 0x808080 as char), 1, 3, 0xC0)) -20 -select hex(weight_string(cast(_latin1 0x808080 as char), 2, 3, 0xC0)); -hex(weight_string(cast(_latin1 0x808080 as char), 2, 3, 0xC0)) -20AC -select hex(weight_string(cast(_latin1 0x808080 as char), 3, 3, 0xC0)); -hex(weight_string(cast(_latin1 0x808080 as char), 3, 3, 0xC0)) -20AC20 -select hex(weight_string(cast(_latin1 0x808080 as char), 4, 3, 0xC0)); -hex(weight_string(cast(_latin1 0x808080 as char), 4, 3, 0xC0)) -20AC20AC -select hex(weight_string(cast(_latin1 0x808080 as char), 5, 3, 0xC0)); -hex(weight_string(cast(_latin1 0x808080 as char), 5, 3, 0xC0)) -20AC20AC20 -select hex(weight_string(cast(_latin1 0x808080 as char),25, 3, 0xC0)); -hex(weight_string(cast(_latin1 0x808080 as char),25, 3, 0xC0)) -20AC20AC20AC00200020002000200020002000200020002000 -select hex(weight_string(cast(_latin1 0x808080 as char), 1, 4, 0xC0)); -hex(weight_string(cast(_latin1 0x808080 as char), 1, 4, 0xC0)) -20 -select hex(weight_string(cast(_latin1 0x808080 as char), 2, 4, 0xC0)); -hex(weight_string(cast(_latin1 0x808080 as char), 2, 4, 0xC0)) -20AC -select hex(weight_string(cast(_latin1 0x808080 as char), 3, 4, 0xC0)); -hex(weight_string(cast(_latin1 0x808080 as char), 3, 4, 0xC0)) -20AC20 -select hex(weight_string(cast(_latin1 0x808080 as char), 4, 4, 0xC0)); -hex(weight_string(cast(_latin1 0x808080 as char), 4, 4, 0xC0)) -20AC20AC -select hex(weight_string(cast(_latin1 0x808080 as char), 5, 4, 0xC0)); -hex(weight_string(cast(_latin1 0x808080 as char), 5, 4, 0xC0)) -20AC20AC20 -select hex(weight_string(cast(_latin1 0x808080 as char),25, 4, 0xC0)); -hex(weight_string(cast(_latin1 0x808080 as char),25, 4, 0xC0)) -20AC20AC20AC00200020002000200020002000200020002000 -select @@collation_connection; -@@collation_connection -utf8mb3_general_ci -select hex(weight_string('a' LEVEL 1)); -hex(weight_string('a' LEVEL 1)) -0041 -select hex(weight_string('A' LEVEL 1)); -hex(weight_string('A' LEVEL 1)) -0041 -select hex(weight_string('abc' LEVEL 1)); -hex(weight_string('abc' LEVEL 1)) -004100420043 -select hex(weight_string('abc' as char(2) LEVEL 1)); -hex(weight_string('abc' as char(2) LEVEL 1)) -00410042 -select hex(weight_string('abc' as char(3) LEVEL 1)); -hex(weight_string('abc' as char(3) LEVEL 1)) -004100420043 -select hex(weight_string('abc' as char(5) LEVEL 1)); -hex(weight_string('abc' as char(5) LEVEL 1)) -00410042004300200020 -select hex(weight_string('abc' as char(5) LEVEL 1 REVERSE)); -hex(weight_string('abc' as char(5) LEVEL 1 REVERSE)) -20002000430042004100 -select hex(weight_string('abc' as char(5) LEVEL 1 DESC)); -hex(weight_string('abc' as char(5) LEVEL 1 DESC)) -FFBEFFBDFFBCFFDFFFDF -select hex(weight_string('abc' as char(5) LEVEL 1 DESC REVERSE)); -hex(weight_string('abc' as char(5) LEVEL 1 DESC REVERSE)) -DFFFDFFFBCFFBDFFBEFF -set @@collation_connection=utf8_bin; -select @@collation_connection; -@@collation_connection -utf8mb3_bin -CREATE TABLE t1 AS SELECT 'a' AS a; -SHOW CREATE TABLE t1; -Table Create Table -t1 CREATE TABLE `t1` ( - `a` varchar(1) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin NOT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci -CREATE TABLE t2 AS SELECT WEIGHT_STRING(a) AS ws FROM t1; -SHOW CREATE TABLE t2; -Table Create Table -t2 CREATE TABLE `t2` ( - `ws` varbinary(2) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci -SELECT HEX(WEIGHT_STRING(a)) FROM t1; -HEX(WEIGHT_STRING(a)) -0061 -SELECT HEX(ws) FROM t2; -HEX(ws) -0061 -DROP TABLE t2; -DROP TABLE t1; -CREATE TABLE t1 AS SELECT REPEAT('a',5) AS a; -SHOW CREATE TABLE t1; -Table Create Table -t1 CREATE TABLE `t1` ( - `a` varchar(5) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci -CREATE TABLE t2 AS SELECT WEIGHT_STRING(a) AS ws FROM t1; -SHOW CREATE TABLE t2; -Table Create Table -t2 CREATE TABLE `t2` ( - `ws` varbinary(10) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci -SELECT HEX(WEIGHT_STRING(a)) FROM t1; -HEX(WEIGHT_STRING(a)) -00610061006100610061 -SELECT HEX(ws) FROM t2; -HEX(ws) -00610061006100610061 -DROP TABLE t2; -CREATE TABLE t2 AS SELECT WEIGHT_STRING(a AS CHAR(3)) AS ws FROM t1; -SHOW CREATE TABLE t2; -Table Create Table -t2 CREATE TABLE `t2` ( - `ws` varbinary(6) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci -SELECT HEX(WEIGHT_STRING(a AS CHAR(3))) FROM t1; -HEX(WEIGHT_STRING(a AS CHAR(3))) -006100610061 -SELECT HEX(ws) FROM t2; -HEX(ws) -006100610061 -DROP TABLE t2; -CREATE TABLE t2 AS SELECT WEIGHT_STRING(a AS CHAR(10)) AS ws FROM t1; -SHOW CREATE TABLE t2; -Table Create Table -t2 CREATE TABLE `t2` ( - `ws` varbinary(20) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci -SELECT HEX(WEIGHT_STRING(a AS CHAR(10))) FROM t1; -HEX(WEIGHT_STRING(a AS CHAR(10))) -0061006100610061006100200020002000200020 -SELECT HEX(ws) FROM t2; -HEX(ws) -0061006100610061006100200020002000200020 -DROP TABLE t2; -DROP TABLE t1; -select hex(weight_string('a')); -hex(weight_string('a')) -0061 -select hex(weight_string('A')); -hex(weight_string('A')) -0041 -select hex(weight_string('abc')); -hex(weight_string('abc')) -006100620063 -select hex(weight_string('abc' as char(2))); -hex(weight_string('abc' as char(2))) -00610062 -select hex(weight_string('abc' as char(3))); -hex(weight_string('abc' as char(3))) -006100620063 -select hex(weight_string('abc' as char(5))); -hex(weight_string('abc' as char(5))) -00610062006300200020 -select hex(weight_string('abc', 1, 2, 0xC0)); -hex(weight_string('abc', 1, 2, 0xC0)) -00 -select hex(weight_string('abc', 2, 2, 0xC0)); -hex(weight_string('abc', 2, 2, 0xC0)) -0061 -select hex(weight_string('abc', 3, 2, 0xC0)); -hex(weight_string('abc', 3, 2, 0xC0)) -006100 -select hex(weight_string('abc', 4, 2, 0xC0)); -hex(weight_string('abc', 4, 2, 0xC0)) -00610062 -select hex(weight_string('abc', 5, 2, 0xC0)); -hex(weight_string('abc', 5, 2, 0xC0)) -0061006200 -select hex(weight_string('abc',25, 2, 0xC0)); -hex(weight_string('abc',25, 2, 0xC0)) -00610062002000200020002000200020002000200020002000 -select hex(weight_string('abc', 1, 3, 0xC0)); -hex(weight_string('abc', 1, 3, 0xC0)) -00 -select hex(weight_string('abc', 2, 3, 0xC0)); -hex(weight_string('abc', 2, 3, 0xC0)) -0061 -select hex(weight_string('abc', 3, 3, 0xC0)); -hex(weight_string('abc', 3, 3, 0xC0)) -006100 -select hex(weight_string('abc', 4, 3, 0xC0)); -hex(weight_string('abc', 4, 3, 0xC0)) -00610062 -select hex(weight_string('abc', 5, 3, 0xC0)); -hex(weight_string('abc', 5, 3, 0xC0)) -0061006200 -select hex(weight_string('abc',25, 3, 0xC0)); -hex(weight_string('abc',25, 3, 0xC0)) -00610062006300200020002000200020002000200020002000 -select hex(weight_string('abc', 1, 4, 0xC0)); -hex(weight_string('abc', 1, 4, 0xC0)) -00 -select hex(weight_string('abc', 2, 4, 0xC0)); -hex(weight_string('abc', 2, 4, 0xC0)) -0061 -select hex(weight_string('abc', 3, 4, 0xC0)); -hex(weight_string('abc', 3, 4, 0xC0)) -006100 -select hex(weight_string('abc', 4, 4, 0xC0)); -hex(weight_string('abc', 4, 4, 0xC0)) -00610062 -select hex(weight_string('abc', 5, 4, 0xC0)); -hex(weight_string('abc', 5, 4, 0xC0)) -0061006200 -select hex(weight_string('abc',25, 4, 0xC0)); -hex(weight_string('abc',25, 4, 0xC0)) -00610062006300200020002000200020002000200020002000 -select @@collation_connection; -@@collation_connection -utf8mb3_bin -select hex(weight_string(cast(_latin1 0x80 as char))); -hex(weight_string(cast(_latin1 0x80 as char))) -20AC -select hex(weight_string(cast(_latin1 0x808080 as char))); -hex(weight_string(cast(_latin1 0x808080 as char))) -20AC20AC20AC -select hex(weight_string(cast(_latin1 0x808080 as char) as char(2))); -hex(weight_string(cast(_latin1 0x808080 as char) as char(2))) -20AC20AC -select hex(weight_string(cast(_latin1 0x808080 as char) as char(3))); -hex(weight_string(cast(_latin1 0x808080 as char) as char(3))) -20AC20AC20AC -select hex(weight_string(cast(_latin1 0x808080 as char) as char(5))); -hex(weight_string(cast(_latin1 0x808080 as char) as char(5))) -20AC20AC20AC00200020 -select hex(weight_string(cast(_latin1 0x808080 as char), 1, 2, 0xC0)); -hex(weight_string(cast(_latin1 0x808080 as char), 1, 2, 0xC0)) -20 -select hex(weight_string(cast(_latin1 0x808080 as char), 2, 2, 0xC0)); -hex(weight_string(cast(_latin1 0x808080 as char), 2, 2, 0xC0)) -20AC -select hex(weight_string(cast(_latin1 0x808080 as char), 3, 2, 0xC0)); -hex(weight_string(cast(_latin1 0x808080 as char), 3, 2, 0xC0)) -20AC20 -select hex(weight_string(cast(_latin1 0x808080 as char), 4, 2, 0xC0)); -hex(weight_string(cast(_latin1 0x808080 as char), 4, 2, 0xC0)) -20AC20AC -select hex(weight_string(cast(_latin1 0x808080 as char), 5, 2, 0xC0)); -hex(weight_string(cast(_latin1 0x808080 as char), 5, 2, 0xC0)) -20AC20AC00 -select hex(weight_string(cast(_latin1 0x808080 as char),25, 2, 0xC0)); -hex(weight_string(cast(_latin1 0x808080 as char),25, 2, 0xC0)) -20AC20AC002000200020002000200020002000200020002000 -select hex(weight_string(cast(_latin1 0x808080 as char), 1, 3, 0xC0)); -hex(weight_string(cast(_latin1 0x808080 as char), 1, 3, 0xC0)) -20 -select hex(weight_string(cast(_latin1 0x808080 as char), 2, 3, 0xC0)); -hex(weight_string(cast(_latin1 0x808080 as char), 2, 3, 0xC0)) -20AC -select hex(weight_string(cast(_latin1 0x808080 as char), 3, 3, 0xC0)); -hex(weight_string(cast(_latin1 0x808080 as char), 3, 3, 0xC0)) -20AC20 -select hex(weight_string(cast(_latin1 0x808080 as char), 4, 3, 0xC0)); -hex(weight_string(cast(_latin1 0x808080 as char), 4, 3, 0xC0)) -20AC20AC -select hex(weight_string(cast(_latin1 0x808080 as char), 5, 3, 0xC0)); -hex(weight_string(cast(_latin1 0x808080 as char), 5, 3, 0xC0)) -20AC20AC20 -select hex(weight_string(cast(_latin1 0x808080 as char),25, 3, 0xC0)); -hex(weight_string(cast(_latin1 0x808080 as char),25, 3, 0xC0)) -20AC20AC20AC00200020002000200020002000200020002000 -select hex(weight_string(cast(_latin1 0x808080 as char), 1, 4, 0xC0)); -hex(weight_string(cast(_latin1 0x808080 as char), 1, 4, 0xC0)) -20 -select hex(weight_string(cast(_latin1 0x808080 as char), 2, 4, 0xC0)); -hex(weight_string(cast(_latin1 0x808080 as char), 2, 4, 0xC0)) -20AC -select hex(weight_string(cast(_latin1 0x808080 as char), 3, 4, 0xC0)); -hex(weight_string(cast(_latin1 0x808080 as char), 3, 4, 0xC0)) -20AC20 -select hex(weight_string(cast(_latin1 0x808080 as char), 4, 4, 0xC0)); -hex(weight_string(cast(_latin1 0x808080 as char), 4, 4, 0xC0)) -20AC20AC -select hex(weight_string(cast(_latin1 0x808080 as char), 5, 4, 0xC0)); -hex(weight_string(cast(_latin1 0x808080 as char), 5, 4, 0xC0)) -20AC20AC20 -select hex(weight_string(cast(_latin1 0x808080 as char),25, 4, 0xC0)); -hex(weight_string(cast(_latin1 0x808080 as char),25, 4, 0xC0)) -20AC20AC20AC00200020002000200020002000200020002000 -select @@collation_connection; -@@collation_connection -utf8mb3_bin -select hex(weight_string('a' LEVEL 1)); -hex(weight_string('a' LEVEL 1)) -0061 -select hex(weight_string('A' LEVEL 1)); -hex(weight_string('A' LEVEL 1)) -0041 -select hex(weight_string('abc' LEVEL 1)); -hex(weight_string('abc' LEVEL 1)) -006100620063 -select hex(weight_string('abc' as char(2) LEVEL 1)); -hex(weight_string('abc' as char(2) LEVEL 1)) -00610062 -select hex(weight_string('abc' as char(3) LEVEL 1)); -hex(weight_string('abc' as char(3) LEVEL 1)) -006100620063 -select hex(weight_string('abc' as char(5) LEVEL 1)); -hex(weight_string('abc' as char(5) LEVEL 1)) -00610062006300200020 -select hex(weight_string('abc' as char(5) LEVEL 1 REVERSE)); -hex(weight_string('abc' as char(5) LEVEL 1 REVERSE)) -20002000630062006100 -select hex(weight_string('abc' as char(5) LEVEL 1 DESC)); -hex(weight_string('abc' as char(5) LEVEL 1 DESC)) -FF9EFF9DFF9CFFDFFFDF -select hex(weight_string('abc' as char(5) LEVEL 1 DESC REVERSE)); -hex(weight_string('abc' as char(5) LEVEL 1 DESC REVERSE)) -DFFFDFFF9CFF9DFF9EFF # # Checking strnxfrm() with odd length # @@ -6788,285 +6176,6 @@ set max_sort_length=default; # # Start of 10.0 tests # -SET NAMES utf8 COLLATE utf8_bin; -# -# MDEV-7149 Constant condition propagation erroneously applied for LIKE -# -CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS c1 LIMIT 0; -SHOW CREATE TABLE t1; -Table Create Table -t1 CREATE TABLE `t1` ( - `c1` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci -INSERT INTO t1 VALUES ('a'),('a '); -SELECT * FROM t1 WHERE CONCAT(c1)='a'; -c1 -a -a -SELECT * FROM t1 WHERE CONCAT(c1) LIKE 'a '; -c1 -a -SELECT * FROM t1 WHERE CONCAT(c1)='a' AND CONCAT(c1) LIKE 'a '; -c1 -a -EXPLAIN EXTENDED SELECT * FROM t1 WHERE CONCAT(c1)='a' AND CONCAT(c1) LIKE 'a '; -id select_type table type possible_keys key key_len ref rows filtered Extra -1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where -Warnings: -Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where concat(`test`.`t1`.`c1`) = 'a' and concat(`test`.`t1`.`c1`) like 'a ' -DROP TABLE t1; -CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS c1 LIMIT 0; -SHOW CREATE TABLE t1; -Table Create Table -t1 CREATE TABLE `t1` ( - `c1` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci -INSERT INTO t1 VALUES ('a'),('a '); -SELECT * FROM t1 WHERE 'a'=CONCAT(c1); -c1 -a -a -SELECT * FROM t1 WHERE 'a ' LIKE CONCAT(c1); -c1 -a -SELECT * FROM t1 WHERE 'a'=CONCAT(c1) AND 'a ' LIKE CONCAT(c1); -c1 -a -EXPLAIN EXTENDED SELECT * FROM t1 WHERE 'a'=CONCAT(c1) AND 'a ' LIKE CONCAT(c1); -id select_type table type possible_keys key key_len ref rows filtered Extra -1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where -Warnings: -Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where 'a' = concat(`test`.`t1`.`c1`) and 'a ' like concat(`test`.`t1`.`c1`) -DROP TABLE t1; -CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS c1 LIMIT 0; -SHOW CREATE TABLE t1; -Table Create Table -t1 CREATE TABLE `t1` ( - `c1` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci -INSERT INTO t1 VALUES ('%'),('% '); -SELECT * FROM t1 WHERE '% '=CONCAT(c1); -c1 -% -% -SELECT * FROM t1 WHERE 'a' LIKE CONCAT(c1); -c1 -% -SELECT * FROM t1 WHERE '% '=CONCAT(c1) AND 'a' LIKE CONCAT(c1); -c1 -% -EXPLAIN EXTENDED SELECT * FROM t1 WHERE '% '=CONCAT(c1) AND 'a' LIKE CONCAT(c1); -id select_type table type possible_keys key key_len ref rows filtered Extra -1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where -Warnings: -Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where '% ' = concat(`test`.`t1`.`c1`) and 'a' like concat(`test`.`t1`.`c1`) -DROP TABLE t1; -CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS c1 LIMIT 0; -SHOW CREATE TABLE t1; -Table Create Table -t1 CREATE TABLE `t1` ( - `c1` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci -INSERT INTO t1 VALUES ('%'),('% '); -SELECT * FROM t1 WHERE '%'=CONCAT(c1); -c1 -% -% -SELECT * FROM t1 WHERE 'a' LIKE CONCAT(c1); -c1 -% -SELECT * FROM t1 WHERE '%'=CONCAT(c1) AND 'a' LIKE CONCAT(c1); -c1 -% -EXPLAIN EXTENDED SELECT * FROM t1 WHERE '%'=CONCAT(c1) AND 'a' LIKE CONCAT(c1); -id select_type table type possible_keys key key_len ref rows filtered Extra -1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where -Warnings: -Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where '%' = concat(`test`.`t1`.`c1`) and 'a' like concat(`test`.`t1`.`c1`) -DROP TABLE t1; -# -# MDEV-8694 Wrong result for SELECT..WHERE a NOT LIKE 'a ' AND a='a' -# -CREATE TABLE t1 AS SELECT SPACE(10) AS a LIMIT 0; -SHOW CREATE TABLE t1; -Table Create Table -t1 CREATE TABLE `t1` ( - `a` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci -INSERT INTO t1 VALUES ('a'),('a '); -SELECT a, LENGTH(a) FROM t1 WHERE a NOT LIKE 'a '; -a LENGTH(a) -a 1 -SELECT a, LENGTH(a) FROM t1 WHERE a NOT LIKE 'a ' AND a='a'; -a LENGTH(a) -a 1 -EXPLAIN EXTENDED SELECT a, LENGTH(a) FROM t1 WHERE a NOT LIKE 'a ' AND a='a'; -id select_type table type possible_keys key key_len ref rows filtered Extra -1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where -Warnings: -Note 1003 select `test`.`t1`.`a` AS `a`,octet_length(`test`.`t1`.`a`) AS `LENGTH(a)` from `test`.`t1` where `test`.`t1`.`a` = 'a' and `test`.`t1`.`a` not like 'a ' -DROP TABLE t1; -# -# End of MDEV-8694 -# -SET NAMES utf8; -# -# MDEV-7149 Constant condition propagation erroneously applied for LIKE -# -CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS c1 LIMIT 0; -SHOW CREATE TABLE t1; -Table Create Table -t1 CREATE TABLE `t1` ( - `c1` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci -INSERT INTO t1 VALUES ('a'),('a '); -SELECT * FROM t1 WHERE CONCAT(c1)='a'; -c1 -a -a -SELECT * FROM t1 WHERE CONCAT(c1) LIKE 'a '; -c1 -a -SELECT * FROM t1 WHERE CONCAT(c1)='a' AND CONCAT(c1) LIKE 'a '; -c1 -a -EXPLAIN EXTENDED SELECT * FROM t1 WHERE CONCAT(c1)='a' AND CONCAT(c1) LIKE 'a '; -id select_type table type possible_keys key key_len ref rows filtered Extra -1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where -Warnings: -Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where concat(`test`.`t1`.`c1`) = 'a' and concat(`test`.`t1`.`c1`) like 'a ' -DROP TABLE t1; -CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS c1 LIMIT 0; -SHOW CREATE TABLE t1; -Table Create Table -t1 CREATE TABLE `t1` ( - `c1` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci -INSERT INTO t1 VALUES ('a'),('a '); -SELECT * FROM t1 WHERE 'a'=CONCAT(c1); -c1 -a -a -SELECT * FROM t1 WHERE 'a ' LIKE CONCAT(c1); -c1 -a -SELECT * FROM t1 WHERE 'a'=CONCAT(c1) AND 'a ' LIKE CONCAT(c1); -c1 -a -EXPLAIN EXTENDED SELECT * FROM t1 WHERE 'a'=CONCAT(c1) AND 'a ' LIKE CONCAT(c1); -id select_type table type possible_keys key key_len ref rows filtered Extra -1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where -Warnings: -Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where 'a' = concat(`test`.`t1`.`c1`) and 'a ' like concat(`test`.`t1`.`c1`) -DROP TABLE t1; -CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS c1 LIMIT 0; -SHOW CREATE TABLE t1; -Table Create Table -t1 CREATE TABLE `t1` ( - `c1` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci -INSERT INTO t1 VALUES ('%'),('% '); -SELECT * FROM t1 WHERE '% '=CONCAT(c1); -c1 -% -% -SELECT * FROM t1 WHERE 'a' LIKE CONCAT(c1); -c1 -% -SELECT * FROM t1 WHERE '% '=CONCAT(c1) AND 'a' LIKE CONCAT(c1); -c1 -% -EXPLAIN EXTENDED SELECT * FROM t1 WHERE '% '=CONCAT(c1) AND 'a' LIKE CONCAT(c1); -id select_type table type possible_keys key key_len ref rows filtered Extra -1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where -Warnings: -Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where '% ' = concat(`test`.`t1`.`c1`) and 'a' like concat(`test`.`t1`.`c1`) -DROP TABLE t1; -CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS c1 LIMIT 0; -SHOW CREATE TABLE t1; -Table Create Table -t1 CREATE TABLE `t1` ( - `c1` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci -INSERT INTO t1 VALUES ('%'),('% '); -SELECT * FROM t1 WHERE '%'=CONCAT(c1); -c1 -% -% -SELECT * FROM t1 WHERE 'a' LIKE CONCAT(c1); -c1 -% -SELECT * FROM t1 WHERE '%'=CONCAT(c1) AND 'a' LIKE CONCAT(c1); -c1 -% -EXPLAIN EXTENDED SELECT * FROM t1 WHERE '%'=CONCAT(c1) AND 'a' LIKE CONCAT(c1); -id select_type table type possible_keys key key_len ref rows filtered Extra -1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where -Warnings: -Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where '%' = concat(`test`.`t1`.`c1`) and 'a' like concat(`test`.`t1`.`c1`) -DROP TABLE t1; -# -# MDEV-8694 Wrong result for SELECT..WHERE a NOT LIKE 'a ' AND a='a' -# -CREATE TABLE t1 AS SELECT SPACE(10) AS a LIMIT 0; -SHOW CREATE TABLE t1; -Table Create Table -t1 CREATE TABLE `t1` ( - `a` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci -INSERT INTO t1 VALUES ('a'),('a '); -SELECT a, LENGTH(a) FROM t1 WHERE a NOT LIKE 'a '; -a LENGTH(a) -a 1 -SELECT a, LENGTH(a) FROM t1 WHERE a NOT LIKE 'a ' AND a='a'; -a LENGTH(a) -a 1 -EXPLAIN EXTENDED SELECT a, LENGTH(a) FROM t1 WHERE a NOT LIKE 'a ' AND a='a'; -id select_type table type possible_keys key key_len ref rows filtered Extra -1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where -Warnings: -Note 1003 select `test`.`t1`.`a` AS `a`,octet_length(`test`.`t1`.`a`) AS `LENGTH(a)` from `test`.`t1` where `test`.`t1`.`a` not like 'a ' and `test`.`t1`.`a` = 'a' -DROP TABLE t1; -# -# End of MDEV-8694 -# -# -# MDEV-7149 Constant condition propagation erroneously applied for LIKE -# -CREATE TABLE t1 AS SELECT REPEAT('a',10) AS c1 LIMIT 0; -SHOW CREATE TABLE t1; -Table Create Table -t1 CREATE TABLE `t1` ( - `c1` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci -INSERT INTO t1 VALUES ('ae'),('ä'); -SELECT * FROM t1 WHERE c1='ä'; -c1 -ä -SELECT * FROM t1 WHERE c1 LIKE 'ae'; -c1 -ae -SELECT * FROM t1 WHERE c1='ä' AND c1 LIKE 'ae'; -c1 -EXPLAIN EXTENDED SELECT * FROM t1 WHERE c1='ä' AND c1 LIKE 'ae'; -id select_type table type possible_keys key key_len ref rows filtered Extra -1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where -Warnings: -Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where `test`.`t1`.`c1` = 'ä' and `test`.`t1`.`c1` like 'ae' -SELECT * FROM t1 WHERE CONCAT(c1)='ä'; -c1 -ä -SELECT * FROM t1 WHERE CONCAT(c1) LIKE 'ae'; -c1 -ae -SELECT * FROM t1 WHERE CONCAT(c1)='ä' AND CONCAT(c1) LIKE 'ae'; -c1 -EXPLAIN EXTENDED SELECT * FROM t1 WHERE CONCAT(c1)='ä' AND CONCAT(c1) LIKE 'ae'; -id select_type table type possible_keys key key_len ref rows filtered Extra -1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where -Warnings: -Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where concat(`test`.`t1`.`c1`) = 'ä' and concat(`test`.`t1`.`c1`) like 'ae' -DROP TABLE IF EXISTS t1; # # MDEV-6666 Malformed result for CONCAT(utf8_column, binary_string) # diff --git a/mysql-test/main/ctype_utf8.test b/mysql-test/main/ctype_utf8.test index a875fe51f3a..a5607942d6a 100644 --- a/mysql-test/main/ctype_utf8.test +++ b/mysql-test/main/ctype_utf8.test @@ -16,6 +16,14 @@ SET TIME_ZONE='+03:00'; --source include/default_optimizer_switch.inc --source include/default_charset.inc +# +# Remove the 'utf8mb3=xxx' substring from @@character_set_collations to change +# the default utf8mb3 collation to the hard-coded default utf8mb3_general_ci +# +SET character_set_collations= REGEXP_REPLACE(@@character_set_collations, '(utf8mb3=[a-z0-9_]*)', ''); +SELECT @@character_set_collations; + + --disable_warnings drop table if exists t1,t2,t3,t4; drop database if exists mysqltest; @@ -60,32 +68,6 @@ select convert(_latin1'G select CONVERT(_koi8r'' USING utf8) LIKE CONVERT(_koi8r'' USING utf8); select CONVERT(_koi8r'' USING utf8) LIKE CONVERT(_koi8r'' USING utf8); -# -# Check the following: -# "a" == "a " -# "a\0" < "a" -# "a\0" < "a " - -SELECT 'a' = 'a '; -SELECT 'a\0' < 'a'; -SELECT 'a\0' < 'a '; -SELECT 'a\t' < 'a'; -SELECT 'a\t' < 'a '; - -# -# The same for binary collation -# -SELECT 'a' = 'a ' collate utf8_bin; -SELECT 'a\0' < 'a' collate utf8_bin; -SELECT 'a\0' < 'a ' collate utf8_bin; -SELECT 'a\t' < 'a' collate utf8_bin; -SELECT 'a\t' < 'a ' collate utf8_bin; - -CREATE TABLE t1 (a char(10) character set utf8 not null); -INSERT INTO t1 VALUES ('a'),('a\0'),('a\t'),('a '); -SELECT hex(a),STRCMP(a,'a'), STRCMP(a,'a ') FROM t1; -DROP TABLE t1; - # # Fix this, it should return 1: # @@ -204,13 +186,6 @@ select * from t1 where a = 'b' and a = 'b'; select * from t1 where a = 'b' and a != 'b'; drop table t1; -# -# Testing regexp -# -set names utf8; ---source include/ctype_regex.inc ---source include/ctype_regex_utf8.inc - # # Bug #4555 # ALTER TABLE crashes mysqld with enum column collated utf8_unicode_ci @@ -1761,16 +1736,6 @@ SET sql_mode=default; --echo # WL#3664 WEIGHT_STRING --echo # -set names utf8; ---source include/weight_string.inc ---source include/weight_string_euro.inc ---source include/weight_string_l1.inc - -set @@collation_connection=utf8_bin; ---source include/weight_string.inc ---source include/weight_string_euro.inc ---source include/weight_string_l1.inc - --echo # --echo # Checking strnxfrm() with odd length --echo # @@ -1792,13 +1757,6 @@ set max_sort_length=default; --echo # Start of 10.0 tests --echo # -SET NAMES utf8 COLLATE utf8_bin; ---source include/ctype_like_cond_propagation.inc -SET NAMES utf8; ---source include/ctype_like_cond_propagation.inc ---source include/ctype_like_cond_propagation_utf8_german.inc - - --echo # --echo # MDEV-6666 Malformed result for CONCAT(utf8_column, binary_string) --echo # diff --git a/mysql-test/main/ctype_utf8_def_upgrade.result b/mysql-test/main/ctype_utf8_def_upgrade.result index d30f8670536..304321d8bf2 100644 --- a/mysql-test/main/ctype_utf8_def_upgrade.result +++ b/mysql-test/main/ctype_utf8_def_upgrade.result @@ -52,7 +52,7 @@ SET @@character_set_database=DEFAULT; # Emulate a pre-4.1 database without db.opt SHOW CREATE DATABASE db1; Database Create Database -db1 CREATE DATABASE `db1` /*!40100 DEFAULT CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci */ +db1 CREATE DATABASE `db1` /*!40100 DEFAULT CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci */ USE db1; SELECT @@character_set_database, 'taken from defaults' AS comment; @@character_set_database comment diff --git a/mysql-test/main/ctype_utf8mb3_bin.result b/mysql-test/main/ctype_utf8mb3_bin.result new file mode 100644 index 00000000000..627bbb11b68 --- /dev/null +++ b/mysql-test/main/ctype_utf8mb3_bin.result @@ -0,0 +1,622 @@ +# +# Start of 5.5 tests +# +SET NAMES utf8mb3 COLLATE utf8mb3_bin; +SELECT COLLATION('a'); +COLLATION('a') +utf8mb3_bin +SELECT 'a' = 'a ' AS c; +c +1 +SELECT 'a\0' = 'a' AS c; +c +0 +SELECT 'a\0' = 'a ' AS c; +c +0 +SELECT 'a\t' = 'a' AS c; +c +0 +SELECT 'a\t' = 'a ' AS c; +c +0 +SELECT 'a' < 'a ' AS c; +c +0 +SELECT 'a\0' < 'a' AS c; +c +1 +SELECT 'a\0' < 'a ' AS c; +c +1 +SELECT 'a\t' < 'a' AS c; +c +1 +SELECT 'a\t' < 'a ' AS c; +c +1 +SELECT 'a' > 'a ' AS c; +c +0 +SELECT 'a\0' > 'a' AS c; +c +0 +SELECT 'a\0' > 'a ' AS c; +c +0 +SELECT 'a\t' > 'a' AS c; +c +0 +SELECT 'a\t' > 'a ' AS c; +c +0 +CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS a LIMIT 0; +EXECUTE IMMEDIATE +REPLACE(REPLACE( +"ALTER TABLE t1 ADD a_readable " + "TEXT CHARACTER SET latin1 COLLATE DEFAULT " + "GENERATED ALWAYS AS " + "(RPAD(QUOTE(REGEXP_REPLACE(t1.a, '(\\\\x{00}|\\\\x{09})', '.')), 10))", +'DEFAULT', collation('a')), +'latin1', charset('a')); +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `a` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin DEFAULT NULL, + `a_readable` text CHARACTER SET utf8mb3 COLLATE utf8mb3_bin GENERATED ALWAYS AS (rpad(quote(regexp_replace(`a`,'(\\x{00}|\\x{09})','.')),10)) VIRTUAL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci +INSERT INTO t1 (a) VALUES ('a'),('a\0'),('a\t'),('a '); +SELECT hex(a),STRCMP(a,'a'), STRCMP(a,'a ') FROM t1; +hex(a) STRCMP(a,'a') STRCMP(a,'a ') +61 0 0 +6100 -1 -1 +6109 -1 -1 +6120 0 0 +SELECT HEX(a), a_readable FROM t1 ORDER BY a, BINARY a; +HEX(a) a_readable +6100 'a.' +6109 'a.' +61 'a' +6120 'a ' +SELECT +HEX(t1.a) AS t1a, +CASE STRCMP(t1.a, t2.a) WHEN -1 THEN '<' WHEN 1 THEN '>' ELSE '=' END AS cmp, +HEX(t2.a) AS t2a, +t1.a_readable, +t2.a_readable +FROM t1 t1, t1 t2 +ORDER BY BINARY t1.a, BINARY t2.a; +t1a cmp t2a a_readable a_readable +61 = 61 'a' 'a' +61 > 6100 'a' 'a.' +61 > 6109 'a' 'a.' +61 = 6120 'a' 'a ' +6100 < 61 'a.' 'a' +6100 = 6100 'a.' 'a.' +6100 < 6109 'a.' 'a.' +6100 < 6120 'a.' 'a ' +6109 < 61 'a.' 'a' +6109 > 6100 'a.' 'a.' +6109 = 6109 'a.' 'a.' +6109 < 6120 'a.' 'a ' +6120 = 61 'a ' 'a' +6120 > 6100 'a ' 'a.' +6120 > 6109 'a ' 'a.' +6120 = 6120 'a ' 'a ' +DROP TABLE t1; +# +# End of 5.5 tests +# +# +# Start of 5.6 tests +# +# +# WL#3664 WEIGHT_STRING +# +SET NAMES utf8mb3 COLLATE utf8mb3_bin; +select @@collation_connection; +@@collation_connection +utf8mb3_bin +CREATE TABLE t1 AS SELECT 'a' AS a; +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `a` varchar(1) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin NOT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci +CREATE TABLE t2 AS SELECT WEIGHT_STRING(a) AS ws FROM t1; +SHOW CREATE TABLE t2; +Table Create Table +t2 CREATE TABLE `t2` ( + `ws` varbinary(2) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci +SELECT HEX(WEIGHT_STRING(a)) FROM t1; +HEX(WEIGHT_STRING(a)) +0061 +SELECT HEX(ws) FROM t2; +HEX(ws) +0061 +DROP TABLE t2; +DROP TABLE t1; +CREATE TABLE t1 AS SELECT REPEAT('a',5) AS a; +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `a` varchar(5) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci +CREATE TABLE t2 AS SELECT WEIGHT_STRING(a) AS ws FROM t1; +SHOW CREATE TABLE t2; +Table Create Table +t2 CREATE TABLE `t2` ( + `ws` varbinary(10) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci +SELECT HEX(WEIGHT_STRING(a)) FROM t1; +HEX(WEIGHT_STRING(a)) +00610061006100610061 +SELECT HEX(ws) FROM t2; +HEX(ws) +00610061006100610061 +DROP TABLE t2; +CREATE TABLE t2 AS SELECT WEIGHT_STRING(a AS CHAR(3)) AS ws FROM t1; +SHOW CREATE TABLE t2; +Table Create Table +t2 CREATE TABLE `t2` ( + `ws` varbinary(6) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci +SELECT HEX(WEIGHT_STRING(a AS CHAR(3))) FROM t1; +HEX(WEIGHT_STRING(a AS CHAR(3))) +006100610061 +SELECT HEX(ws) FROM t2; +HEX(ws) +006100610061 +DROP TABLE t2; +CREATE TABLE t2 AS SELECT WEIGHT_STRING(a AS CHAR(10)) AS ws FROM t1; +SHOW CREATE TABLE t2; +Table Create Table +t2 CREATE TABLE `t2` ( + `ws` varbinary(20) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci +SELECT HEX(WEIGHT_STRING(a AS CHAR(10))) FROM t1; +HEX(WEIGHT_STRING(a AS CHAR(10))) +0061006100610061006100200020002000200020 +SELECT HEX(ws) FROM t2; +HEX(ws) +0061006100610061006100200020002000200020 +DROP TABLE t2; +DROP TABLE t1; +select hex(weight_string('a')); +hex(weight_string('a')) +0061 +select hex(weight_string('A')); +hex(weight_string('A')) +0041 +select hex(weight_string('abc')); +hex(weight_string('abc')) +006100620063 +select hex(weight_string('abc' as char(2))); +hex(weight_string('abc' as char(2))) +00610062 +select hex(weight_string('abc' as char(3))); +hex(weight_string('abc' as char(3))) +006100620063 +select hex(weight_string('abc' as char(5))); +hex(weight_string('abc' as char(5))) +00610062006300200020 +select hex(weight_string('abc', 1, 2, 0xC0)); +hex(weight_string('abc', 1, 2, 0xC0)) +00 +select hex(weight_string('abc', 2, 2, 0xC0)); +hex(weight_string('abc', 2, 2, 0xC0)) +0061 +select hex(weight_string('abc', 3, 2, 0xC0)); +hex(weight_string('abc', 3, 2, 0xC0)) +006100 +select hex(weight_string('abc', 4, 2, 0xC0)); +hex(weight_string('abc', 4, 2, 0xC0)) +00610062 +select hex(weight_string('abc', 5, 2, 0xC0)); +hex(weight_string('abc', 5, 2, 0xC0)) +0061006200 +select hex(weight_string('abc',25, 2, 0xC0)); +hex(weight_string('abc',25, 2, 0xC0)) +00610062002000200020002000200020002000200020002000 +select hex(weight_string('abc', 1, 3, 0xC0)); +hex(weight_string('abc', 1, 3, 0xC0)) +00 +select hex(weight_string('abc', 2, 3, 0xC0)); +hex(weight_string('abc', 2, 3, 0xC0)) +0061 +select hex(weight_string('abc', 3, 3, 0xC0)); +hex(weight_string('abc', 3, 3, 0xC0)) +006100 +select hex(weight_string('abc', 4, 3, 0xC0)); +hex(weight_string('abc', 4, 3, 0xC0)) +00610062 +select hex(weight_string('abc', 5, 3, 0xC0)); +hex(weight_string('abc', 5, 3, 0xC0)) +0061006200 +select hex(weight_string('abc',25, 3, 0xC0)); +hex(weight_string('abc',25, 3, 0xC0)) +00610062006300200020002000200020002000200020002000 +select hex(weight_string('abc', 1, 4, 0xC0)); +hex(weight_string('abc', 1, 4, 0xC0)) +00 +select hex(weight_string('abc', 2, 4, 0xC0)); +hex(weight_string('abc', 2, 4, 0xC0)) +0061 +select hex(weight_string('abc', 3, 4, 0xC0)); +hex(weight_string('abc', 3, 4, 0xC0)) +006100 +select hex(weight_string('abc', 4, 4, 0xC0)); +hex(weight_string('abc', 4, 4, 0xC0)) +00610062 +select hex(weight_string('abc', 5, 4, 0xC0)); +hex(weight_string('abc', 5, 4, 0xC0)) +0061006200 +select hex(weight_string('abc',25, 4, 0xC0)); +hex(weight_string('abc',25, 4, 0xC0)) +00610062006300200020002000200020002000200020002000 +select @@collation_connection; +@@collation_connection +utf8mb3_bin +select hex(weight_string(cast(_latin1 0x80 as char))); +hex(weight_string(cast(_latin1 0x80 as char))) +20AC +select hex(weight_string(cast(_latin1 0x808080 as char))); +hex(weight_string(cast(_latin1 0x808080 as char))) +20AC20AC20AC +select hex(weight_string(cast(_latin1 0x808080 as char) as char(2))); +hex(weight_string(cast(_latin1 0x808080 as char) as char(2))) +20AC20AC +select hex(weight_string(cast(_latin1 0x808080 as char) as char(3))); +hex(weight_string(cast(_latin1 0x808080 as char) as char(3))) +20AC20AC20AC +select hex(weight_string(cast(_latin1 0x808080 as char) as char(5))); +hex(weight_string(cast(_latin1 0x808080 as char) as char(5))) +20AC20AC20AC00200020 +select hex(weight_string(cast(_latin1 0x808080 as char), 1, 2, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char), 1, 2, 0xC0)) +20 +select hex(weight_string(cast(_latin1 0x808080 as char), 2, 2, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char), 2, 2, 0xC0)) +20AC +select hex(weight_string(cast(_latin1 0x808080 as char), 3, 2, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char), 3, 2, 0xC0)) +20AC20 +select hex(weight_string(cast(_latin1 0x808080 as char), 4, 2, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char), 4, 2, 0xC0)) +20AC20AC +select hex(weight_string(cast(_latin1 0x808080 as char), 5, 2, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char), 5, 2, 0xC0)) +20AC20AC00 +select hex(weight_string(cast(_latin1 0x808080 as char),25, 2, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char),25, 2, 0xC0)) +20AC20AC002000200020002000200020002000200020002000 +select hex(weight_string(cast(_latin1 0x808080 as char), 1, 3, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char), 1, 3, 0xC0)) +20 +select hex(weight_string(cast(_latin1 0x808080 as char), 2, 3, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char), 2, 3, 0xC0)) +20AC +select hex(weight_string(cast(_latin1 0x808080 as char), 3, 3, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char), 3, 3, 0xC0)) +20AC20 +select hex(weight_string(cast(_latin1 0x808080 as char), 4, 3, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char), 4, 3, 0xC0)) +20AC20AC +select hex(weight_string(cast(_latin1 0x808080 as char), 5, 3, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char), 5, 3, 0xC0)) +20AC20AC20 +select hex(weight_string(cast(_latin1 0x808080 as char),25, 3, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char),25, 3, 0xC0)) +20AC20AC20AC00200020002000200020002000200020002000 +select hex(weight_string(cast(_latin1 0x808080 as char), 1, 4, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char), 1, 4, 0xC0)) +20 +select hex(weight_string(cast(_latin1 0x808080 as char), 2, 4, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char), 2, 4, 0xC0)) +20AC +select hex(weight_string(cast(_latin1 0x808080 as char), 3, 4, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char), 3, 4, 0xC0)) +20AC20 +select hex(weight_string(cast(_latin1 0x808080 as char), 4, 4, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char), 4, 4, 0xC0)) +20AC20AC +select hex(weight_string(cast(_latin1 0x808080 as char), 5, 4, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char), 5, 4, 0xC0)) +20AC20AC20 +select hex(weight_string(cast(_latin1 0x808080 as char),25, 4, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char),25, 4, 0xC0)) +20AC20AC20AC00200020002000200020002000200020002000 +select @@collation_connection; +@@collation_connection +utf8mb3_bin +select hex(weight_string('a' LEVEL 1)); +hex(weight_string('a' LEVEL 1)) +0061 +select hex(weight_string('A' LEVEL 1)); +hex(weight_string('A' LEVEL 1)) +0041 +select hex(weight_string('abc' LEVEL 1)); +hex(weight_string('abc' LEVEL 1)) +006100620063 +select hex(weight_string('abc' as char(2) LEVEL 1)); +hex(weight_string('abc' as char(2) LEVEL 1)) +00610062 +select hex(weight_string('abc' as char(3) LEVEL 1)); +hex(weight_string('abc' as char(3) LEVEL 1)) +006100620063 +select hex(weight_string('abc' as char(5) LEVEL 1)); +hex(weight_string('abc' as char(5) LEVEL 1)) +00610062006300200020 +select hex(weight_string('abc' as char(5) LEVEL 1 REVERSE)); +hex(weight_string('abc' as char(5) LEVEL 1 REVERSE)) +20002000630062006100 +select hex(weight_string('abc' as char(5) LEVEL 1 DESC)); +hex(weight_string('abc' as char(5) LEVEL 1 DESC)) +FF9EFF9DFF9CFFDFFFDF +select hex(weight_string('abc' as char(5) LEVEL 1 DESC REVERSE)); +hex(weight_string('abc' as char(5) LEVEL 1 DESC REVERSE)) +DFFFDFFF9CFF9DFF9EFF +# +# End of 5.6 tests +# +# +# Start of 10.0 tests +# +SET NAMES utf8mb3 COLLATE utf8mb3_bin; +# +# Bug#31081 server crash in regexp function +# +drop table if exists t1; +create table t1 as +select repeat(' ', 64) as s1, repeat(' ',64) as s2 +union +select null, null; +show create table t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `s1` varchar(64) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin DEFAULT NULL, + `s2` varchar(64) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci +delete from t1; +insert into t1 values('aaa','aaa'); +insert into t1 values('aaa|qqq','qqq'); +insert into t1 values('gheis','^[^a-dXYZ]+$'); +insert into t1 values('aab','^aa?b'); +insert into t1 values('Baaan','^Ba*n'); +insert into t1 values('aaa','qqq|aaa'); +insert into t1 values('qqq','qqq|aaa'); +insert into t1 values('bbb','qqq|aaa'); +insert into t1 values('bbb','qqq'); +insert into t1 values('aaa','aba'); +insert into t1 values(null,'abc'); +insert into t1 values('def',null); +insert into t1 values(null,null); +insert into t1 values('ghi','ghi['); +select HIGH_PRIORITY s1 regexp s2 from t1; +s1 regexp s2 +0 +0 +0 +1 +1 +1 +1 +1 +1 +1 +NULL +NULL +NULL +NULL +drop table t1; +# +# Bug #3928 regexp [[:>:]] and UTF-8 +# +SELECT @@character_set_client, @@collation_connection; +@@character_set_client @@collation_connection +utf8mb3 utf8mb3_bin +# This should return TRUE +select 'вася' rlike '\\bвася\\b'; +'вася' rlike '\\bвася\\b' +1 +select 'вася ' rlike '\\bвася\\b'; +'вася ' rlike '\\bвася\\b' +1 +select ' вася' rlike '\\bвася\\b'; +' вася' rlike '\\bвася\\b' +1 +select ' вася ' rlike '\\bвася\\b'; +' вася ' rlike '\\bвася\\b' +1 +select 'вася' rlike '[[:<:]]вася[[:>:]]'; +'вася' rlike '[[:<:]]вася[[:>:]]' +1 +select 'вася ' rlike '[[:<:]]вася[[:>:]]'; +'вася ' rlike '[[:<:]]вася[[:>:]]' +1 +select ' вася' rlike '[[:<:]]вася[[:>:]]'; +' вася' rlike '[[:<:]]вася[[:>:]]' +1 +select ' вася ' rlike '[[:<:]]вася[[:>:]]'; +' вася ' rlike '[[:<:]]вася[[:>:]]' +1 +# This should return FALSE +select 'васяz' rlike '\\bвася\\b'; +'васяz' rlike '\\bвася\\b' +0 +select 'zвася' rlike '\\bвася\\b'; +'zвася' rlike '\\bвася\\b' +0 +select 'zвасяz' rlike '\\bвася\\b'; +'zвасяz' rlike '\\bвася\\b' +0 +select 'васяz' rlike '[[:<:]]вася[[:>:]]'; +'васяz' rlike '[[:<:]]вася[[:>:]]' +0 +select 'zвася' rlike '[[:<:]]вася[[:>:]]'; +'zвася' rlike '[[:<:]]вася[[:>:]]' +0 +select 'zвасяz' rlike '[[:<:]]вася[[:>:]]'; +'zвасяz' rlike '[[:<:]]вася[[:>:]]' +0 +# +# MDEV-7149 Constant condition propagation erroneously applied for LIKE +# +CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS c1 LIMIT 0; +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `c1` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci +INSERT INTO t1 VALUES ('a'),('a '); +SELECT * FROM t1 WHERE CONCAT(c1)='a'; +c1 +a +a +SELECT * FROM t1 WHERE CONCAT(c1) LIKE 'a '; +c1 +a +SELECT * FROM t1 WHERE CONCAT(c1)='a' AND CONCAT(c1) LIKE 'a '; +c1 +a +EXPLAIN EXTENDED SELECT * FROM t1 WHERE CONCAT(c1)='a' AND CONCAT(c1) LIKE 'a '; +id select_type table type possible_keys key key_len ref rows filtered Extra +1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where +Warnings: +Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where concat(`test`.`t1`.`c1`) = 'a' and concat(`test`.`t1`.`c1`) like 'a ' +DROP TABLE t1; +CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS c1 LIMIT 0; +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `c1` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci +INSERT INTO t1 VALUES ('a'),('a '); +SELECT * FROM t1 WHERE 'a'=CONCAT(c1); +c1 +a +a +SELECT * FROM t1 WHERE 'a ' LIKE CONCAT(c1); +c1 +a +SELECT * FROM t1 WHERE 'a'=CONCAT(c1) AND 'a ' LIKE CONCAT(c1); +c1 +a +EXPLAIN EXTENDED SELECT * FROM t1 WHERE 'a'=CONCAT(c1) AND 'a ' LIKE CONCAT(c1); +id select_type table type possible_keys key key_len ref rows filtered Extra +1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where +Warnings: +Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where 'a' = concat(`test`.`t1`.`c1`) and 'a ' like concat(`test`.`t1`.`c1`) +DROP TABLE t1; +CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS c1 LIMIT 0; +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `c1` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci +INSERT INTO t1 VALUES ('%'),('% '); +SELECT * FROM t1 WHERE '% '=CONCAT(c1); +c1 +% +% +SELECT * FROM t1 WHERE 'a' LIKE CONCAT(c1); +c1 +% +SELECT * FROM t1 WHERE '% '=CONCAT(c1) AND 'a' LIKE CONCAT(c1); +c1 +% +EXPLAIN EXTENDED SELECT * FROM t1 WHERE '% '=CONCAT(c1) AND 'a' LIKE CONCAT(c1); +id select_type table type possible_keys key key_len ref rows filtered Extra +1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where +Warnings: +Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where '% ' = concat(`test`.`t1`.`c1`) and 'a' like concat(`test`.`t1`.`c1`) +DROP TABLE t1; +CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS c1 LIMIT 0; +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `c1` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci +INSERT INTO t1 VALUES ('%'),('% '); +SELECT * FROM t1 WHERE '%'=CONCAT(c1); +c1 +% +% +SELECT * FROM t1 WHERE 'a' LIKE CONCAT(c1); +c1 +% +SELECT * FROM t1 WHERE '%'=CONCAT(c1) AND 'a' LIKE CONCAT(c1); +c1 +% +EXPLAIN EXTENDED SELECT * FROM t1 WHERE '%'=CONCAT(c1) AND 'a' LIKE CONCAT(c1); +id select_type table type possible_keys key key_len ref rows filtered Extra +1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where +Warnings: +Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where '%' = concat(`test`.`t1`.`c1`) and 'a' like concat(`test`.`t1`.`c1`) +DROP TABLE t1; +# +# MDEV-8694 Wrong result for SELECT..WHERE a NOT LIKE 'a ' AND a='a' +# +CREATE TABLE t1 AS SELECT SPACE(10) AS a LIMIT 0; +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `a` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci +INSERT INTO t1 VALUES ('a'),('a '); +SELECT a, LENGTH(a) FROM t1 WHERE a NOT LIKE 'a '; +a LENGTH(a) +a 1 +SELECT a, LENGTH(a) FROM t1 WHERE a NOT LIKE 'a ' AND a='a'; +a LENGTH(a) +a 1 +EXPLAIN EXTENDED SELECT a, LENGTH(a) FROM t1 WHERE a NOT LIKE 'a ' AND a='a'; +id select_type table type possible_keys key key_len ref rows filtered Extra +1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where +Warnings: +Note 1003 select `test`.`t1`.`a` AS `a`,octet_length(`test`.`t1`.`a`) AS `LENGTH(a)` from `test`.`t1` where `test`.`t1`.`a` = 'a' and `test`.`t1`.`a` not like 'a ' +DROP TABLE t1; +# +# End of MDEV-8694 +# +# +# MDEV-7149 Constant condition propagation erroneously applied for LIKE +# +CREATE TABLE t1 AS SELECT REPEAT('a',10) AS c1 LIMIT 0; +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `c1` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci +INSERT INTO t1 VALUES ('ae'),('ä'); +SELECT * FROM t1 WHERE c1='ä'; +c1 +ä +SELECT * FROM t1 WHERE c1 LIKE 'ae'; +c1 +ae +SELECT * FROM t1 WHERE c1='ä' AND c1 LIKE 'ae'; +c1 +EXPLAIN EXTENDED SELECT * FROM t1 WHERE c1='ä' AND c1 LIKE 'ae'; +id select_type table type possible_keys key key_len ref rows filtered Extra +1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where +Warnings: +Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where `test`.`t1`.`c1` = 'ä' and `test`.`t1`.`c1` like 'ae' +SELECT * FROM t1 WHERE CONCAT(c1)='ä'; +c1 +ä +SELECT * FROM t1 WHERE CONCAT(c1) LIKE 'ae'; +c1 +ae +SELECT * FROM t1 WHERE CONCAT(c1)='ä' AND CONCAT(c1) LIKE 'ae'; +c1 +EXPLAIN EXTENDED SELECT * FROM t1 WHERE CONCAT(c1)='ä' AND CONCAT(c1) LIKE 'ae'; +id select_type table type possible_keys key key_len ref rows filtered Extra +1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where +Warnings: +Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where concat(`test`.`t1`.`c1`) = 'ä' and concat(`test`.`t1`.`c1`) like 'ae' +DROP TABLE IF EXISTS t1; +# +# End of 10.0 tests +# diff --git a/mysql-test/main/ctype_utf8mb3_bin.test b/mysql-test/main/ctype_utf8mb3_bin.test new file mode 100644 index 00000000000..836ef47805c --- /dev/null +++ b/mysql-test/main/ctype_utf8mb3_bin.test @@ -0,0 +1,52 @@ +--echo # +--echo # Start of 5.5 tests +--echo # + +SET NAMES utf8mb3 COLLATE utf8mb3_bin; +--source include/ctype_special_chars.inc + +--echo # +--echo # End of 5.5 tests +--echo # + + + +--echo # +--echo # Start of 5.6 tests +--echo # + +--echo # +--echo # WL#3664 WEIGHT_STRING +--echo # + +SET NAMES utf8mb3 COLLATE utf8mb3_bin; +--source include/weight_string.inc +--source include/weight_string_euro.inc +--source include/weight_string_l1.inc + + +--echo # +--echo # End of 5.6 tests +--echo # + + +--echo # +--echo # Start of 10.0 tests +--echo # + +# +# Testing regexp +# +SET NAMES utf8mb3 COLLATE utf8mb3_bin; +--source include/ctype_regex.inc +--source include/ctype_regex_utf8.inc + +# +# MDEV-7149 Constant condition propagation erroneously applied for LIKE +# +--source include/ctype_like_cond_propagation.inc +--source include/ctype_like_cond_propagation_utf8_german.inc + +--echo # +--echo # End of 10.0 tests +--echo # diff --git a/mysql-test/main/ctype_utf8mb3_general_ci.result b/mysql-test/main/ctype_utf8mb3_general_ci.result new file mode 100644 index 00000000000..3699acfda82 --- /dev/null +++ b/mysql-test/main/ctype_utf8mb3_general_ci.result @@ -0,0 +1,622 @@ +# +# Start of 5.5 tests +# +SET NAMES utf8mb3 COLLATE utf8mb3_general_ci; +SELECT COLLATION('a'); +COLLATION('a') +utf8mb3_general_ci +SELECT 'a' = 'a ' AS c; +c +1 +SELECT 'a\0' = 'a' AS c; +c +0 +SELECT 'a\0' = 'a ' AS c; +c +0 +SELECT 'a\t' = 'a' AS c; +c +0 +SELECT 'a\t' = 'a ' AS c; +c +0 +SELECT 'a' < 'a ' AS c; +c +0 +SELECT 'a\0' < 'a' AS c; +c +1 +SELECT 'a\0' < 'a ' AS c; +c +1 +SELECT 'a\t' < 'a' AS c; +c +1 +SELECT 'a\t' < 'a ' AS c; +c +1 +SELECT 'a' > 'a ' AS c; +c +0 +SELECT 'a\0' > 'a' AS c; +c +0 +SELECT 'a\0' > 'a ' AS c; +c +0 +SELECT 'a\t' > 'a' AS c; +c +0 +SELECT 'a\t' > 'a ' AS c; +c +0 +CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS a LIMIT 0; +EXECUTE IMMEDIATE +REPLACE(REPLACE( +"ALTER TABLE t1 ADD a_readable " + "TEXT CHARACTER SET latin1 COLLATE DEFAULT " + "GENERATED ALWAYS AS " + "(RPAD(QUOTE(REGEXP_REPLACE(t1.a, '(\\\\x{00}|\\\\x{09})', '.')), 10))", +'DEFAULT', collation('a')), +'latin1', charset('a')); +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `a` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL, + `a_readable` text CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci GENERATED ALWAYS AS (rpad(quote(regexp_replace(`a`,'(\\x{00}|\\x{09})','.')),10)) VIRTUAL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci +INSERT INTO t1 (a) VALUES ('a'),('a\0'),('a\t'),('a '); +SELECT hex(a),STRCMP(a,'a'), STRCMP(a,'a ') FROM t1; +hex(a) STRCMP(a,'a') STRCMP(a,'a ') +61 0 0 +6100 -1 -1 +6109 -1 -1 +6120 0 0 +SELECT HEX(a), a_readable FROM t1 ORDER BY a, BINARY a; +HEX(a) a_readable +6100 'a.' +6109 'a.' +61 'a' +6120 'a ' +SELECT +HEX(t1.a) AS t1a, +CASE STRCMP(t1.a, t2.a) WHEN -1 THEN '<' WHEN 1 THEN '>' ELSE '=' END AS cmp, +HEX(t2.a) AS t2a, +t1.a_readable, +t2.a_readable +FROM t1 t1, t1 t2 +ORDER BY BINARY t1.a, BINARY t2.a; +t1a cmp t2a a_readable a_readable +61 = 61 'a' 'a' +61 > 6100 'a' 'a.' +61 > 6109 'a' 'a.' +61 = 6120 'a' 'a ' +6100 < 61 'a.' 'a' +6100 = 6100 'a.' 'a.' +6100 < 6109 'a.' 'a.' +6100 < 6120 'a.' 'a ' +6109 < 61 'a.' 'a' +6109 > 6100 'a.' 'a.' +6109 = 6109 'a.' 'a.' +6109 < 6120 'a.' 'a ' +6120 = 61 'a ' 'a' +6120 > 6100 'a ' 'a.' +6120 > 6109 'a ' 'a.' +6120 = 6120 'a ' 'a ' +DROP TABLE t1; +# +# End of 5.5 tests +# +# +# Start of 5.6 tests +# +# +# WL#3664 WEIGHT_STRING +# +SET NAMES utf8mb3 COLLATE utf8mb3_general_ci; +select @@collation_connection; +@@collation_connection +utf8mb3_general_ci +CREATE TABLE t1 AS SELECT 'a' AS a; +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `a` varchar(1) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci +CREATE TABLE t2 AS SELECT WEIGHT_STRING(a) AS ws FROM t1; +SHOW CREATE TABLE t2; +Table Create Table +t2 CREATE TABLE `t2` ( + `ws` varbinary(2) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci +SELECT HEX(WEIGHT_STRING(a)) FROM t1; +HEX(WEIGHT_STRING(a)) +0041 +SELECT HEX(ws) FROM t2; +HEX(ws) +0041 +DROP TABLE t2; +DROP TABLE t1; +CREATE TABLE t1 AS SELECT REPEAT('a',5) AS a; +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `a` varchar(5) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci +CREATE TABLE t2 AS SELECT WEIGHT_STRING(a) AS ws FROM t1; +SHOW CREATE TABLE t2; +Table Create Table +t2 CREATE TABLE `t2` ( + `ws` varbinary(10) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci +SELECT HEX(WEIGHT_STRING(a)) FROM t1; +HEX(WEIGHT_STRING(a)) +00410041004100410041 +SELECT HEX(ws) FROM t2; +HEX(ws) +00410041004100410041 +DROP TABLE t2; +CREATE TABLE t2 AS SELECT WEIGHT_STRING(a AS CHAR(3)) AS ws FROM t1; +SHOW CREATE TABLE t2; +Table Create Table +t2 CREATE TABLE `t2` ( + `ws` varbinary(6) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci +SELECT HEX(WEIGHT_STRING(a AS CHAR(3))) FROM t1; +HEX(WEIGHT_STRING(a AS CHAR(3))) +004100410041 +SELECT HEX(ws) FROM t2; +HEX(ws) +004100410041 +DROP TABLE t2; +CREATE TABLE t2 AS SELECT WEIGHT_STRING(a AS CHAR(10)) AS ws FROM t1; +SHOW CREATE TABLE t2; +Table Create Table +t2 CREATE TABLE `t2` ( + `ws` varbinary(20) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci +SELECT HEX(WEIGHT_STRING(a AS CHAR(10))) FROM t1; +HEX(WEIGHT_STRING(a AS CHAR(10))) +0041004100410041004100200020002000200020 +SELECT HEX(ws) FROM t2; +HEX(ws) +0041004100410041004100200020002000200020 +DROP TABLE t2; +DROP TABLE t1; +select hex(weight_string('a')); +hex(weight_string('a')) +0041 +select hex(weight_string('A')); +hex(weight_string('A')) +0041 +select hex(weight_string('abc')); +hex(weight_string('abc')) +004100420043 +select hex(weight_string('abc' as char(2))); +hex(weight_string('abc' as char(2))) +00410042 +select hex(weight_string('abc' as char(3))); +hex(weight_string('abc' as char(3))) +004100420043 +select hex(weight_string('abc' as char(5))); +hex(weight_string('abc' as char(5))) +00410042004300200020 +select hex(weight_string('abc', 1, 2, 0xC0)); +hex(weight_string('abc', 1, 2, 0xC0)) +00 +select hex(weight_string('abc', 2, 2, 0xC0)); +hex(weight_string('abc', 2, 2, 0xC0)) +0041 +select hex(weight_string('abc', 3, 2, 0xC0)); +hex(weight_string('abc', 3, 2, 0xC0)) +004100 +select hex(weight_string('abc', 4, 2, 0xC0)); +hex(weight_string('abc', 4, 2, 0xC0)) +00410042 +select hex(weight_string('abc', 5, 2, 0xC0)); +hex(weight_string('abc', 5, 2, 0xC0)) +0041004200 +select hex(weight_string('abc',25, 2, 0xC0)); +hex(weight_string('abc',25, 2, 0xC0)) +00410042002000200020002000200020002000200020002000 +select hex(weight_string('abc', 1, 3, 0xC0)); +hex(weight_string('abc', 1, 3, 0xC0)) +00 +select hex(weight_string('abc', 2, 3, 0xC0)); +hex(weight_string('abc', 2, 3, 0xC0)) +0041 +select hex(weight_string('abc', 3, 3, 0xC0)); +hex(weight_string('abc', 3, 3, 0xC0)) +004100 +select hex(weight_string('abc', 4, 3, 0xC0)); +hex(weight_string('abc', 4, 3, 0xC0)) +00410042 +select hex(weight_string('abc', 5, 3, 0xC0)); +hex(weight_string('abc', 5, 3, 0xC0)) +0041004200 +select hex(weight_string('abc',25, 3, 0xC0)); +hex(weight_string('abc',25, 3, 0xC0)) +00410042004300200020002000200020002000200020002000 +select hex(weight_string('abc', 1, 4, 0xC0)); +hex(weight_string('abc', 1, 4, 0xC0)) +00 +select hex(weight_string('abc', 2, 4, 0xC0)); +hex(weight_string('abc', 2, 4, 0xC0)) +0041 +select hex(weight_string('abc', 3, 4, 0xC0)); +hex(weight_string('abc', 3, 4, 0xC0)) +004100 +select hex(weight_string('abc', 4, 4, 0xC0)); +hex(weight_string('abc', 4, 4, 0xC0)) +00410042 +select hex(weight_string('abc', 5, 4, 0xC0)); +hex(weight_string('abc', 5, 4, 0xC0)) +0041004200 +select hex(weight_string('abc',25, 4, 0xC0)); +hex(weight_string('abc',25, 4, 0xC0)) +00410042004300200020002000200020002000200020002000 +select @@collation_connection; +@@collation_connection +utf8mb3_general_ci +select hex(weight_string(cast(_latin1 0x80 as char))); +hex(weight_string(cast(_latin1 0x80 as char))) +20AC +select hex(weight_string(cast(_latin1 0x808080 as char))); +hex(weight_string(cast(_latin1 0x808080 as char))) +20AC20AC20AC +select hex(weight_string(cast(_latin1 0x808080 as char) as char(2))); +hex(weight_string(cast(_latin1 0x808080 as char) as char(2))) +20AC20AC +select hex(weight_string(cast(_latin1 0x808080 as char) as char(3))); +hex(weight_string(cast(_latin1 0x808080 as char) as char(3))) +20AC20AC20AC +select hex(weight_string(cast(_latin1 0x808080 as char) as char(5))); +hex(weight_string(cast(_latin1 0x808080 as char) as char(5))) +20AC20AC20AC00200020 +select hex(weight_string(cast(_latin1 0x808080 as char), 1, 2, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char), 1, 2, 0xC0)) +20 +select hex(weight_string(cast(_latin1 0x808080 as char), 2, 2, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char), 2, 2, 0xC0)) +20AC +select hex(weight_string(cast(_latin1 0x808080 as char), 3, 2, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char), 3, 2, 0xC0)) +20AC20 +select hex(weight_string(cast(_latin1 0x808080 as char), 4, 2, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char), 4, 2, 0xC0)) +20AC20AC +select hex(weight_string(cast(_latin1 0x808080 as char), 5, 2, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char), 5, 2, 0xC0)) +20AC20AC00 +select hex(weight_string(cast(_latin1 0x808080 as char),25, 2, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char),25, 2, 0xC0)) +20AC20AC002000200020002000200020002000200020002000 +select hex(weight_string(cast(_latin1 0x808080 as char), 1, 3, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char), 1, 3, 0xC0)) +20 +select hex(weight_string(cast(_latin1 0x808080 as char), 2, 3, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char), 2, 3, 0xC0)) +20AC +select hex(weight_string(cast(_latin1 0x808080 as char), 3, 3, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char), 3, 3, 0xC0)) +20AC20 +select hex(weight_string(cast(_latin1 0x808080 as char), 4, 3, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char), 4, 3, 0xC0)) +20AC20AC +select hex(weight_string(cast(_latin1 0x808080 as char), 5, 3, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char), 5, 3, 0xC0)) +20AC20AC20 +select hex(weight_string(cast(_latin1 0x808080 as char),25, 3, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char),25, 3, 0xC0)) +20AC20AC20AC00200020002000200020002000200020002000 +select hex(weight_string(cast(_latin1 0x808080 as char), 1, 4, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char), 1, 4, 0xC0)) +20 +select hex(weight_string(cast(_latin1 0x808080 as char), 2, 4, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char), 2, 4, 0xC0)) +20AC +select hex(weight_string(cast(_latin1 0x808080 as char), 3, 4, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char), 3, 4, 0xC0)) +20AC20 +select hex(weight_string(cast(_latin1 0x808080 as char), 4, 4, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char), 4, 4, 0xC0)) +20AC20AC +select hex(weight_string(cast(_latin1 0x808080 as char), 5, 4, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char), 5, 4, 0xC0)) +20AC20AC20 +select hex(weight_string(cast(_latin1 0x808080 as char),25, 4, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char),25, 4, 0xC0)) +20AC20AC20AC00200020002000200020002000200020002000 +select @@collation_connection; +@@collation_connection +utf8mb3_general_ci +select hex(weight_string('a' LEVEL 1)); +hex(weight_string('a' LEVEL 1)) +0041 +select hex(weight_string('A' LEVEL 1)); +hex(weight_string('A' LEVEL 1)) +0041 +select hex(weight_string('abc' LEVEL 1)); +hex(weight_string('abc' LEVEL 1)) +004100420043 +select hex(weight_string('abc' as char(2) LEVEL 1)); +hex(weight_string('abc' as char(2) LEVEL 1)) +00410042 +select hex(weight_string('abc' as char(3) LEVEL 1)); +hex(weight_string('abc' as char(3) LEVEL 1)) +004100420043 +select hex(weight_string('abc' as char(5) LEVEL 1)); +hex(weight_string('abc' as char(5) LEVEL 1)) +00410042004300200020 +select hex(weight_string('abc' as char(5) LEVEL 1 REVERSE)); +hex(weight_string('abc' as char(5) LEVEL 1 REVERSE)) +20002000430042004100 +select hex(weight_string('abc' as char(5) LEVEL 1 DESC)); +hex(weight_string('abc' as char(5) LEVEL 1 DESC)) +FFBEFFBDFFBCFFDFFFDF +select hex(weight_string('abc' as char(5) LEVEL 1 DESC REVERSE)); +hex(weight_string('abc' as char(5) LEVEL 1 DESC REVERSE)) +DFFFDFFFBCFFBDFFBEFF +# +# End of 5.6 tests +# +# +# Start of 10.0 tests +# +SET NAMES utf8mb3 COLLATE utf8mb3_general_ci; +# +# Bug#31081 server crash in regexp function +# +drop table if exists t1; +create table t1 as +select repeat(' ', 64) as s1, repeat(' ',64) as s2 +union +select null, null; +show create table t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `s1` varchar(64) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL, + `s2` varchar(64) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci +delete from t1; +insert into t1 values('aaa','aaa'); +insert into t1 values('aaa|qqq','qqq'); +insert into t1 values('gheis','^[^a-dXYZ]+$'); +insert into t1 values('aab','^aa?b'); +insert into t1 values('Baaan','^Ba*n'); +insert into t1 values('aaa','qqq|aaa'); +insert into t1 values('qqq','qqq|aaa'); +insert into t1 values('bbb','qqq|aaa'); +insert into t1 values('bbb','qqq'); +insert into t1 values('aaa','aba'); +insert into t1 values(null,'abc'); +insert into t1 values('def',null); +insert into t1 values(null,null); +insert into t1 values('ghi','ghi['); +select HIGH_PRIORITY s1 regexp s2 from t1; +s1 regexp s2 +0 +0 +0 +1 +1 +1 +1 +1 +1 +1 +NULL +NULL +NULL +NULL +drop table t1; +# +# Bug #3928 regexp [[:>:]] and UTF-8 +# +SELECT @@character_set_client, @@collation_connection; +@@character_set_client @@collation_connection +utf8mb3 utf8mb3_general_ci +# This should return TRUE +select 'вася' rlike '\\bвася\\b'; +'вася' rlike '\\bвася\\b' +1 +select 'вася ' rlike '\\bвася\\b'; +'вася ' rlike '\\bвася\\b' +1 +select ' вася' rlike '\\bвася\\b'; +' вася' rlike '\\bвася\\b' +1 +select ' вася ' rlike '\\bвася\\b'; +' вася ' rlike '\\bвася\\b' +1 +select 'вася' rlike '[[:<:]]вася[[:>:]]'; +'вася' rlike '[[:<:]]вася[[:>:]]' +1 +select 'вася ' rlike '[[:<:]]вася[[:>:]]'; +'вася ' rlike '[[:<:]]вася[[:>:]]' +1 +select ' вася' rlike '[[:<:]]вася[[:>:]]'; +' вася' rlike '[[:<:]]вася[[:>:]]' +1 +select ' вася ' rlike '[[:<:]]вася[[:>:]]'; +' вася ' rlike '[[:<:]]вася[[:>:]]' +1 +# This should return FALSE +select 'васяz' rlike '\\bвася\\b'; +'васяz' rlike '\\bвася\\b' +0 +select 'zвася' rlike '\\bвася\\b'; +'zвася' rlike '\\bвася\\b' +0 +select 'zвасяz' rlike '\\bвася\\b'; +'zвасяz' rlike '\\bвася\\b' +0 +select 'васяz' rlike '[[:<:]]вася[[:>:]]'; +'васяz' rlike '[[:<:]]вася[[:>:]]' +0 +select 'zвася' rlike '[[:<:]]вася[[:>:]]'; +'zвася' rlike '[[:<:]]вася[[:>:]]' +0 +select 'zвасяz' rlike '[[:<:]]вася[[:>:]]'; +'zвасяz' rlike '[[:<:]]вася[[:>:]]' +0 +# +# MDEV-7149 Constant condition propagation erroneously applied for LIKE +# +CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS c1 LIMIT 0; +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `c1` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci +INSERT INTO t1 VALUES ('a'),('a '); +SELECT * FROM t1 WHERE CONCAT(c1)='a'; +c1 +a +a +SELECT * FROM t1 WHERE CONCAT(c1) LIKE 'a '; +c1 +a +SELECT * FROM t1 WHERE CONCAT(c1)='a' AND CONCAT(c1) LIKE 'a '; +c1 +a +EXPLAIN EXTENDED SELECT * FROM t1 WHERE CONCAT(c1)='a' AND CONCAT(c1) LIKE 'a '; +id select_type table type possible_keys key key_len ref rows filtered Extra +1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where +Warnings: +Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where concat(`test`.`t1`.`c1`) = 'a' and concat(`test`.`t1`.`c1`) like 'a ' +DROP TABLE t1; +CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS c1 LIMIT 0; +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `c1` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci +INSERT INTO t1 VALUES ('a'),('a '); +SELECT * FROM t1 WHERE 'a'=CONCAT(c1); +c1 +a +a +SELECT * FROM t1 WHERE 'a ' LIKE CONCAT(c1); +c1 +a +SELECT * FROM t1 WHERE 'a'=CONCAT(c1) AND 'a ' LIKE CONCAT(c1); +c1 +a +EXPLAIN EXTENDED SELECT * FROM t1 WHERE 'a'=CONCAT(c1) AND 'a ' LIKE CONCAT(c1); +id select_type table type possible_keys key key_len ref rows filtered Extra +1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where +Warnings: +Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where 'a' = concat(`test`.`t1`.`c1`) and 'a ' like concat(`test`.`t1`.`c1`) +DROP TABLE t1; +CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS c1 LIMIT 0; +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `c1` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci +INSERT INTO t1 VALUES ('%'),('% '); +SELECT * FROM t1 WHERE '% '=CONCAT(c1); +c1 +% +% +SELECT * FROM t1 WHERE 'a' LIKE CONCAT(c1); +c1 +% +SELECT * FROM t1 WHERE '% '=CONCAT(c1) AND 'a' LIKE CONCAT(c1); +c1 +% +EXPLAIN EXTENDED SELECT * FROM t1 WHERE '% '=CONCAT(c1) AND 'a' LIKE CONCAT(c1); +id select_type table type possible_keys key key_len ref rows filtered Extra +1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where +Warnings: +Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where '% ' = concat(`test`.`t1`.`c1`) and 'a' like concat(`test`.`t1`.`c1`) +DROP TABLE t1; +CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS c1 LIMIT 0; +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `c1` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci +INSERT INTO t1 VALUES ('%'),('% '); +SELECT * FROM t1 WHERE '%'=CONCAT(c1); +c1 +% +% +SELECT * FROM t1 WHERE 'a' LIKE CONCAT(c1); +c1 +% +SELECT * FROM t1 WHERE '%'=CONCAT(c1) AND 'a' LIKE CONCAT(c1); +c1 +% +EXPLAIN EXTENDED SELECT * FROM t1 WHERE '%'=CONCAT(c1) AND 'a' LIKE CONCAT(c1); +id select_type table type possible_keys key key_len ref rows filtered Extra +1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where +Warnings: +Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where '%' = concat(`test`.`t1`.`c1`) and 'a' like concat(`test`.`t1`.`c1`) +DROP TABLE t1; +# +# MDEV-8694 Wrong result for SELECT..WHERE a NOT LIKE 'a ' AND a='a' +# +CREATE TABLE t1 AS SELECT SPACE(10) AS a LIMIT 0; +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `a` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci +INSERT INTO t1 VALUES ('a'),('a '); +SELECT a, LENGTH(a) FROM t1 WHERE a NOT LIKE 'a '; +a LENGTH(a) +a 1 +SELECT a, LENGTH(a) FROM t1 WHERE a NOT LIKE 'a ' AND a='a'; +a LENGTH(a) +a 1 +EXPLAIN EXTENDED SELECT a, LENGTH(a) FROM t1 WHERE a NOT LIKE 'a ' AND a='a'; +id select_type table type possible_keys key key_len ref rows filtered Extra +1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where +Warnings: +Note 1003 select `test`.`t1`.`a` AS `a`,octet_length(`test`.`t1`.`a`) AS `LENGTH(a)` from `test`.`t1` where `test`.`t1`.`a` not like 'a ' and `test`.`t1`.`a` = 'a' +DROP TABLE t1; +# +# End of MDEV-8694 +# +# +# MDEV-7149 Constant condition propagation erroneously applied for LIKE +# +CREATE TABLE t1 AS SELECT REPEAT('a',10) AS c1 LIMIT 0; +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `c1` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci +INSERT INTO t1 VALUES ('ae'),('ä'); +SELECT * FROM t1 WHERE c1='ä'; +c1 +ä +SELECT * FROM t1 WHERE c1 LIKE 'ae'; +c1 +ae +SELECT * FROM t1 WHERE c1='ä' AND c1 LIKE 'ae'; +c1 +EXPLAIN EXTENDED SELECT * FROM t1 WHERE c1='ä' AND c1 LIKE 'ae'; +id select_type table type possible_keys key key_len ref rows filtered Extra +1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where +Warnings: +Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where `test`.`t1`.`c1` = 'ä' and `test`.`t1`.`c1` like 'ae' +SELECT * FROM t1 WHERE CONCAT(c1)='ä'; +c1 +ä +SELECT * FROM t1 WHERE CONCAT(c1) LIKE 'ae'; +c1 +ae +SELECT * FROM t1 WHERE CONCAT(c1)='ä' AND CONCAT(c1) LIKE 'ae'; +c1 +EXPLAIN EXTENDED SELECT * FROM t1 WHERE CONCAT(c1)='ä' AND CONCAT(c1) LIKE 'ae'; +id select_type table type possible_keys key key_len ref rows filtered Extra +1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where +Warnings: +Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where concat(`test`.`t1`.`c1`) = 'ä' and concat(`test`.`t1`.`c1`) like 'ae' +DROP TABLE IF EXISTS t1; +# +# End of 10.0 tests +# diff --git a/mysql-test/main/ctype_utf8mb3_general_ci.test b/mysql-test/main/ctype_utf8mb3_general_ci.test new file mode 100644 index 00000000000..098ab830abc --- /dev/null +++ b/mysql-test/main/ctype_utf8mb3_general_ci.test @@ -0,0 +1,52 @@ +--echo # +--echo # Start of 5.5 tests +--echo # + +SET NAMES utf8mb3 COLLATE utf8mb3_general_ci; +--source include/ctype_special_chars.inc + +--echo # +--echo # End of 5.5 tests +--echo # + + + +--echo # +--echo # Start of 5.6 tests +--echo # + +--echo # +--echo # WL#3664 WEIGHT_STRING +--echo # + +SET NAMES utf8mb3 COLLATE utf8mb3_general_ci; +--source include/weight_string.inc +--source include/weight_string_euro.inc +--source include/weight_string_l1.inc + + +--echo # +--echo # End of 5.6 tests +--echo # + + +--echo # +--echo # Start of 10.0 tests +--echo # + +# +# Testing regexp +# +SET NAMES utf8mb3 COLLATE utf8mb3_general_ci; +--source include/ctype_regex.inc +--source include/ctype_regex_utf8.inc + +# +# MDEV-7149 Constant condition propagation erroneously applied for LIKE +# +--source include/ctype_like_cond_propagation.inc +--source include/ctype_like_cond_propagation_utf8_german.inc + +--echo # +--echo # End of 10.0 tests +--echo # diff --git a/mysql-test/main/ctype_utf8mb3_uca1400_ai_ci.result b/mysql-test/main/ctype_utf8mb3_uca1400_ai_ci.result new file mode 100644 index 00000000000..11867a7a110 --- /dev/null +++ b/mysql-test/main/ctype_utf8mb3_uca1400_ai_ci.result @@ -0,0 +1,622 @@ +# +# Start of 5.5 tests +# +SET NAMES utf8mb3 COLLATE uca1400_ai_ci; +SELECT COLLATION('a'); +COLLATION('a') +utf8mb3_uca1400_ai_ci +SELECT 'a' = 'a ' AS c; +c +1 +SELECT 'a\0' = 'a' AS c; +c +1 +SELECT 'a\0' = 'a ' AS c; +c +1 +SELECT 'a\t' = 'a' AS c; +c +0 +SELECT 'a\t' = 'a ' AS c; +c +0 +SELECT 'a' < 'a ' AS c; +c +0 +SELECT 'a\0' < 'a' AS c; +c +0 +SELECT 'a\0' < 'a ' AS c; +c +0 +SELECT 'a\t' < 'a' AS c; +c +1 +SELECT 'a\t' < 'a ' AS c; +c +1 +SELECT 'a' > 'a ' AS c; +c +0 +SELECT 'a\0' > 'a' AS c; +c +0 +SELECT 'a\0' > 'a ' AS c; +c +0 +SELECT 'a\t' > 'a' AS c; +c +0 +SELECT 'a\t' > 'a ' AS c; +c +0 +CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS a LIMIT 0; +EXECUTE IMMEDIATE +REPLACE(REPLACE( +"ALTER TABLE t1 ADD a_readable " + "TEXT CHARACTER SET latin1 COLLATE DEFAULT " + "GENERATED ALWAYS AS " + "(RPAD(QUOTE(REGEXP_REPLACE(t1.a, '(\\\\x{00}|\\\\x{09})', '.')), 10))", +'DEFAULT', collation('a')), +'latin1', charset('a')); +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `a` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL, + `a_readable` text CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci GENERATED ALWAYS AS (rpad(quote(regexp_replace(`a`,'(\\x{00}|\\x{09})','.')),10)) VIRTUAL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci +INSERT INTO t1 (a) VALUES ('a'),('a\0'),('a\t'),('a '); +SELECT hex(a),STRCMP(a,'a'), STRCMP(a,'a ') FROM t1; +hex(a) STRCMP(a,'a') STRCMP(a,'a ') +61 0 0 +6100 0 0 +6109 -1 -1 +6120 0 0 +SELECT HEX(a), a_readable FROM t1 ORDER BY a, BINARY a; +HEX(a) a_readable +6109 'a.' +61 'a' +6100 'a.' +6120 'a ' +SELECT +HEX(t1.a) AS t1a, +CASE STRCMP(t1.a, t2.a) WHEN -1 THEN '<' WHEN 1 THEN '>' ELSE '=' END AS cmp, +HEX(t2.a) AS t2a, +t1.a_readable, +t2.a_readable +FROM t1 t1, t1 t2 +ORDER BY BINARY t1.a, BINARY t2.a; +t1a cmp t2a a_readable a_readable +61 = 61 'a' 'a' +61 = 6100 'a' 'a.' +61 > 6109 'a' 'a.' +61 = 6120 'a' 'a ' +6100 = 61 'a.' 'a' +6100 = 6100 'a.' 'a.' +6100 > 6109 'a.' 'a.' +6100 = 6120 'a.' 'a ' +6109 < 61 'a.' 'a' +6109 < 6100 'a.' 'a.' +6109 = 6109 'a.' 'a.' +6109 < 6120 'a.' 'a ' +6120 = 61 'a ' 'a' +6120 = 6100 'a ' 'a.' +6120 > 6109 'a ' 'a.' +6120 = 6120 'a ' 'a ' +DROP TABLE t1; +# +# End of 5.5 tests +# +# +# Start of 5.6 tests +# +# +# WL#3664 WEIGHT_STRING +# +SET NAMES utf8mb3 COLLATE uca1400_ai_ci; +select @@collation_connection; +@@collation_connection +utf8mb3_uca1400_ai_ci +CREATE TABLE t1 AS SELECT 'a' AS a; +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `a` varchar(1) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci NOT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci +CREATE TABLE t2 AS SELECT WEIGHT_STRING(a) AS ws FROM t1; +SHOW CREATE TABLE t2; +Table Create Table +t2 CREATE TABLE `t2` ( + `ws` varbinary(16) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci +SELECT HEX(WEIGHT_STRING(a)) FROM t1; +HEX(WEIGHT_STRING(a)) +2075 +SELECT HEX(ws) FROM t2; +HEX(ws) +2075 +DROP TABLE t2; +DROP TABLE t1; +CREATE TABLE t1 AS SELECT REPEAT('a',5) AS a; +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `a` varchar(5) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci +CREATE TABLE t2 AS SELECT WEIGHT_STRING(a) AS ws FROM t1; +SHOW CREATE TABLE t2; +Table Create Table +t2 CREATE TABLE `t2` ( + `ws` varbinary(80) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci +SELECT HEX(WEIGHT_STRING(a)) FROM t1; +HEX(WEIGHT_STRING(a)) +20752075207520752075 +SELECT HEX(ws) FROM t2; +HEX(ws) +20752075207520752075 +DROP TABLE t2; +CREATE TABLE t2 AS SELECT WEIGHT_STRING(a AS CHAR(3)) AS ws FROM t1; +SHOW CREATE TABLE t2; +Table Create Table +t2 CREATE TABLE `t2` ( + `ws` varbinary(48) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci +SELECT HEX(WEIGHT_STRING(a AS CHAR(3))) FROM t1; +HEX(WEIGHT_STRING(a AS CHAR(3))) +207520752075 +SELECT HEX(ws) FROM t2; +HEX(ws) +207520752075 +DROP TABLE t2; +CREATE TABLE t2 AS SELECT WEIGHT_STRING(a AS CHAR(10)) AS ws FROM t1; +SHOW CREATE TABLE t2; +Table Create Table +t2 CREATE TABLE `t2` ( + `ws` varbinary(160) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci +SELECT HEX(WEIGHT_STRING(a AS CHAR(10))) FROM t1; +HEX(WEIGHT_STRING(a AS CHAR(10))) +2075207520752075207502090209020902090209 +SELECT HEX(ws) FROM t2; +HEX(ws) +2075207520752075207502090209020902090209 +DROP TABLE t2; +DROP TABLE t1; +select hex(weight_string('a')); +hex(weight_string('a')) +2075 +select hex(weight_string('A')); +hex(weight_string('A')) +2075 +select hex(weight_string('abc')); +hex(weight_string('abc')) +2075208F20A9 +select hex(weight_string('abc' as char(2))); +hex(weight_string('abc' as char(2))) +2075208F +select hex(weight_string('abc' as char(3))); +hex(weight_string('abc' as char(3))) +2075208F20A9 +select hex(weight_string('abc' as char(5))); +hex(weight_string('abc' as char(5))) +2075208F20A902090209 +select hex(weight_string('abc', 1, 2, 0xC0)); +hex(weight_string('abc', 1, 2, 0xC0)) +20 +select hex(weight_string('abc', 2, 2, 0xC0)); +hex(weight_string('abc', 2, 2, 0xC0)) +2075 +select hex(weight_string('abc', 3, 2, 0xC0)); +hex(weight_string('abc', 3, 2, 0xC0)) +207520 +select hex(weight_string('abc', 4, 2, 0xC0)); +hex(weight_string('abc', 4, 2, 0xC0)) +2075208F +select hex(weight_string('abc', 5, 2, 0xC0)); +hex(weight_string('abc', 5, 2, 0xC0)) +2075208F02 +select hex(weight_string('abc',25, 2, 0xC0)); +hex(weight_string('abc',25, 2, 0xC0)) +2075208F020902090209020902090209020902090209020902 +select hex(weight_string('abc', 1, 3, 0xC0)); +hex(weight_string('abc', 1, 3, 0xC0)) +20 +select hex(weight_string('abc', 2, 3, 0xC0)); +hex(weight_string('abc', 2, 3, 0xC0)) +2075 +select hex(weight_string('abc', 3, 3, 0xC0)); +hex(weight_string('abc', 3, 3, 0xC0)) +207520 +select hex(weight_string('abc', 4, 3, 0xC0)); +hex(weight_string('abc', 4, 3, 0xC0)) +2075208F +select hex(weight_string('abc', 5, 3, 0xC0)); +hex(weight_string('abc', 5, 3, 0xC0)) +2075208F20 +select hex(weight_string('abc',25, 3, 0xC0)); +hex(weight_string('abc',25, 3, 0xC0)) +2075208F20A902090209020902090209020902090209020902 +select hex(weight_string('abc', 1, 4, 0xC0)); +hex(weight_string('abc', 1, 4, 0xC0)) +20 +select hex(weight_string('abc', 2, 4, 0xC0)); +hex(weight_string('abc', 2, 4, 0xC0)) +2075 +select hex(weight_string('abc', 3, 4, 0xC0)); +hex(weight_string('abc', 3, 4, 0xC0)) +207520 +select hex(weight_string('abc', 4, 4, 0xC0)); +hex(weight_string('abc', 4, 4, 0xC0)) +2075208F +select hex(weight_string('abc', 5, 4, 0xC0)); +hex(weight_string('abc', 5, 4, 0xC0)) +2075208F20 +select hex(weight_string('abc',25, 4, 0xC0)); +hex(weight_string('abc',25, 4, 0xC0)) +2075208F20A902090209020902090209020902090209020902 +select @@collation_connection; +@@collation_connection +utf8mb3_uca1400_ai_ci +select hex(weight_string(cast(_latin1 0x80 as char))); +hex(weight_string(cast(_latin1 0x80 as char))) +2055 +select hex(weight_string(cast(_latin1 0x808080 as char))); +hex(weight_string(cast(_latin1 0x808080 as char))) +205520552055 +select hex(weight_string(cast(_latin1 0x808080 as char) as char(2))); +hex(weight_string(cast(_latin1 0x808080 as char) as char(2))) +20552055 +select hex(weight_string(cast(_latin1 0x808080 as char) as char(3))); +hex(weight_string(cast(_latin1 0x808080 as char) as char(3))) +205520552055 +select hex(weight_string(cast(_latin1 0x808080 as char) as char(5))); +hex(weight_string(cast(_latin1 0x808080 as char) as char(5))) +20552055205502090209 +select hex(weight_string(cast(_latin1 0x808080 as char), 1, 2, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char), 1, 2, 0xC0)) +20 +select hex(weight_string(cast(_latin1 0x808080 as char), 2, 2, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char), 2, 2, 0xC0)) +2055 +select hex(weight_string(cast(_latin1 0x808080 as char), 3, 2, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char), 3, 2, 0xC0)) +205520 +select hex(weight_string(cast(_latin1 0x808080 as char), 4, 2, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char), 4, 2, 0xC0)) +20552055 +select hex(weight_string(cast(_latin1 0x808080 as char), 5, 2, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char), 5, 2, 0xC0)) +2055205502 +select hex(weight_string(cast(_latin1 0x808080 as char),25, 2, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char),25, 2, 0xC0)) +20552055020902090209020902090209020902090209020902 +select hex(weight_string(cast(_latin1 0x808080 as char), 1, 3, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char), 1, 3, 0xC0)) +20 +select hex(weight_string(cast(_latin1 0x808080 as char), 2, 3, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char), 2, 3, 0xC0)) +2055 +select hex(weight_string(cast(_latin1 0x808080 as char), 3, 3, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char), 3, 3, 0xC0)) +205520 +select hex(weight_string(cast(_latin1 0x808080 as char), 4, 3, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char), 4, 3, 0xC0)) +20552055 +select hex(weight_string(cast(_latin1 0x808080 as char), 5, 3, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char), 5, 3, 0xC0)) +2055205520 +select hex(weight_string(cast(_latin1 0x808080 as char),25, 3, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char),25, 3, 0xC0)) +20552055205502090209020902090209020902090209020902 +select hex(weight_string(cast(_latin1 0x808080 as char), 1, 4, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char), 1, 4, 0xC0)) +20 +select hex(weight_string(cast(_latin1 0x808080 as char), 2, 4, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char), 2, 4, 0xC0)) +2055 +select hex(weight_string(cast(_latin1 0x808080 as char), 3, 4, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char), 3, 4, 0xC0)) +205520 +select hex(weight_string(cast(_latin1 0x808080 as char), 4, 4, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char), 4, 4, 0xC0)) +20552055 +select hex(weight_string(cast(_latin1 0x808080 as char), 5, 4, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char), 5, 4, 0xC0)) +2055205520 +select hex(weight_string(cast(_latin1 0x808080 as char),25, 4, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char),25, 4, 0xC0)) +20552055205502090209020902090209020902090209020902 +select @@collation_connection; +@@collation_connection +utf8mb3_uca1400_ai_ci +select hex(weight_string('a' LEVEL 1)); +hex(weight_string('a' LEVEL 1)) +2075 +select hex(weight_string('A' LEVEL 1)); +hex(weight_string('A' LEVEL 1)) +2075 +select hex(weight_string('abc' LEVEL 1)); +hex(weight_string('abc' LEVEL 1)) +2075208F20A9 +select hex(weight_string('abc' as char(2) LEVEL 1)); +hex(weight_string('abc' as char(2) LEVEL 1)) +2075208F +select hex(weight_string('abc' as char(3) LEVEL 1)); +hex(weight_string('abc' as char(3) LEVEL 1)) +2075208F20A9 +select hex(weight_string('abc' as char(5) LEVEL 1)); +hex(weight_string('abc' as char(5) LEVEL 1)) +2075208F20A902090209 +select hex(weight_string('abc' as char(5) LEVEL 1 REVERSE)); +hex(weight_string('abc' as char(5) LEVEL 1 REVERSE)) +09020902A9208F207520 +select hex(weight_string('abc' as char(5) LEVEL 1 DESC)); +hex(weight_string('abc' as char(5) LEVEL 1 DESC)) +DF8ADF70DF56FDF6FDF6 +select hex(weight_string('abc' as char(5) LEVEL 1 DESC REVERSE)); +hex(weight_string('abc' as char(5) LEVEL 1 DESC REVERSE)) +F6FDF6FD56DF70DF8ADF +# +# End of 5.6 tests +# +# +# Start of 10.0 tests +# +SET NAMES utf8mb3 COLLATE uca1400_ai_ci; +# +# Bug#31081 server crash in regexp function +# +drop table if exists t1; +create table t1 as +select repeat(' ', 64) as s1, repeat(' ',64) as s2 +union +select null, null; +show create table t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `s1` varchar(64) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL, + `s2` varchar(64) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci +delete from t1; +insert into t1 values('aaa','aaa'); +insert into t1 values('aaa|qqq','qqq'); +insert into t1 values('gheis','^[^a-dXYZ]+$'); +insert into t1 values('aab','^aa?b'); +insert into t1 values('Baaan','^Ba*n'); +insert into t1 values('aaa','qqq|aaa'); +insert into t1 values('qqq','qqq|aaa'); +insert into t1 values('bbb','qqq|aaa'); +insert into t1 values('bbb','qqq'); +insert into t1 values('aaa','aba'); +insert into t1 values(null,'abc'); +insert into t1 values('def',null); +insert into t1 values(null,null); +insert into t1 values('ghi','ghi['); +select HIGH_PRIORITY s1 regexp s2 from t1; +s1 regexp s2 +0 +0 +0 +1 +1 +1 +1 +1 +1 +1 +NULL +NULL +NULL +NULL +drop table t1; +# +# Bug #3928 regexp [[:>:]] and UTF-8 +# +SELECT @@character_set_client, @@collation_connection; +@@character_set_client @@collation_connection +utf8mb3 utf8mb3_uca1400_ai_ci +# This should return TRUE +select 'вася' rlike '\\bвася\\b'; +'вася' rlike '\\bвася\\b' +1 +select 'вася ' rlike '\\bвася\\b'; +'вася ' rlike '\\bвася\\b' +1 +select ' вася' rlike '\\bвася\\b'; +' вася' rlike '\\bвася\\b' +1 +select ' вася ' rlike '\\bвася\\b'; +' вася ' rlike '\\bвася\\b' +1 +select 'вася' rlike '[[:<:]]вася[[:>:]]'; +'вася' rlike '[[:<:]]вася[[:>:]]' +1 +select 'вася ' rlike '[[:<:]]вася[[:>:]]'; +'вася ' rlike '[[:<:]]вася[[:>:]]' +1 +select ' вася' rlike '[[:<:]]вася[[:>:]]'; +' вася' rlike '[[:<:]]вася[[:>:]]' +1 +select ' вася ' rlike '[[:<:]]вася[[:>:]]'; +' вася ' rlike '[[:<:]]вася[[:>:]]' +1 +# This should return FALSE +select 'васяz' rlike '\\bвася\\b'; +'васяz' rlike '\\bвася\\b' +0 +select 'zвася' rlike '\\bвася\\b'; +'zвася' rlike '\\bвася\\b' +0 +select 'zвасяz' rlike '\\bвася\\b'; +'zвасяz' rlike '\\bвася\\b' +0 +select 'васяz' rlike '[[:<:]]вася[[:>:]]'; +'васяz' rlike '[[:<:]]вася[[:>:]]' +0 +select 'zвася' rlike '[[:<:]]вася[[:>:]]'; +'zвася' rlike '[[:<:]]вася[[:>:]]' +0 +select 'zвасяz' rlike '[[:<:]]вася[[:>:]]'; +'zвасяz' rlike '[[:<:]]вася[[:>:]]' +0 +# +# MDEV-7149 Constant condition propagation erroneously applied for LIKE +# +CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS c1 LIMIT 0; +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `c1` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci +INSERT INTO t1 VALUES ('a'),('a '); +SELECT * FROM t1 WHERE CONCAT(c1)='a'; +c1 +a +a +SELECT * FROM t1 WHERE CONCAT(c1) LIKE 'a '; +c1 +a +SELECT * FROM t1 WHERE CONCAT(c1)='a' AND CONCAT(c1) LIKE 'a '; +c1 +a +EXPLAIN EXTENDED SELECT * FROM t1 WHERE CONCAT(c1)='a' AND CONCAT(c1) LIKE 'a '; +id select_type table type possible_keys key key_len ref rows filtered Extra +1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where +Warnings: +Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where concat(`test`.`t1`.`c1`) = 'a' and concat(`test`.`t1`.`c1`) like 'a ' +DROP TABLE t1; +CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS c1 LIMIT 0; +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `c1` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci +INSERT INTO t1 VALUES ('a'),('a '); +SELECT * FROM t1 WHERE 'a'=CONCAT(c1); +c1 +a +a +SELECT * FROM t1 WHERE 'a ' LIKE CONCAT(c1); +c1 +a +SELECT * FROM t1 WHERE 'a'=CONCAT(c1) AND 'a ' LIKE CONCAT(c1); +c1 +a +EXPLAIN EXTENDED SELECT * FROM t1 WHERE 'a'=CONCAT(c1) AND 'a ' LIKE CONCAT(c1); +id select_type table type possible_keys key key_len ref rows filtered Extra +1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where +Warnings: +Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where 'a' = concat(`test`.`t1`.`c1`) and 'a ' like concat(`test`.`t1`.`c1`) +DROP TABLE t1; +CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS c1 LIMIT 0; +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `c1` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci +INSERT INTO t1 VALUES ('%'),('% '); +SELECT * FROM t1 WHERE '% '=CONCAT(c1); +c1 +% +% +SELECT * FROM t1 WHERE 'a' LIKE CONCAT(c1); +c1 +% +SELECT * FROM t1 WHERE '% '=CONCAT(c1) AND 'a' LIKE CONCAT(c1); +c1 +% +EXPLAIN EXTENDED SELECT * FROM t1 WHERE '% '=CONCAT(c1) AND 'a' LIKE CONCAT(c1); +id select_type table type possible_keys key key_len ref rows filtered Extra +1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where +Warnings: +Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where '% ' = concat(`test`.`t1`.`c1`) and 'a' like concat(`test`.`t1`.`c1`) +DROP TABLE t1; +CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS c1 LIMIT 0; +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `c1` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci +INSERT INTO t1 VALUES ('%'),('% '); +SELECT * FROM t1 WHERE '%'=CONCAT(c1); +c1 +% +% +SELECT * FROM t1 WHERE 'a' LIKE CONCAT(c1); +c1 +% +SELECT * FROM t1 WHERE '%'=CONCAT(c1) AND 'a' LIKE CONCAT(c1); +c1 +% +EXPLAIN EXTENDED SELECT * FROM t1 WHERE '%'=CONCAT(c1) AND 'a' LIKE CONCAT(c1); +id select_type table type possible_keys key key_len ref rows filtered Extra +1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where +Warnings: +Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where '%' = concat(`test`.`t1`.`c1`) and 'a' like concat(`test`.`t1`.`c1`) +DROP TABLE t1; +# +# MDEV-8694 Wrong result for SELECT..WHERE a NOT LIKE 'a ' AND a='a' +# +CREATE TABLE t1 AS SELECT SPACE(10) AS a LIMIT 0; +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `a` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci +INSERT INTO t1 VALUES ('a'),('a '); +SELECT a, LENGTH(a) FROM t1 WHERE a NOT LIKE 'a '; +a LENGTH(a) +a 1 +SELECT a, LENGTH(a) FROM t1 WHERE a NOT LIKE 'a ' AND a='a'; +a LENGTH(a) +a 1 +EXPLAIN EXTENDED SELECT a, LENGTH(a) FROM t1 WHERE a NOT LIKE 'a ' AND a='a'; +id select_type table type possible_keys key key_len ref rows filtered Extra +1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where +Warnings: +Note 1003 select `test`.`t1`.`a` AS `a`,octet_length(`test`.`t1`.`a`) AS `LENGTH(a)` from `test`.`t1` where `test`.`t1`.`a` not like 'a ' and `test`.`t1`.`a` = 'a' +DROP TABLE t1; +# +# End of MDEV-8694 +# +# +# MDEV-7149 Constant condition propagation erroneously applied for LIKE +# +CREATE TABLE t1 AS SELECT REPEAT('a',10) AS c1 LIMIT 0; +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `c1` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci +INSERT INTO t1 VALUES ('ae'),('ä'); +SELECT * FROM t1 WHERE c1='ä'; +c1 +ä +SELECT * FROM t1 WHERE c1 LIKE 'ae'; +c1 +ae +SELECT * FROM t1 WHERE c1='ä' AND c1 LIKE 'ae'; +c1 +EXPLAIN EXTENDED SELECT * FROM t1 WHERE c1='ä' AND c1 LIKE 'ae'; +id select_type table type possible_keys key key_len ref rows filtered Extra +1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where +Warnings: +Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where `test`.`t1`.`c1` = 'ä' and `test`.`t1`.`c1` like 'ae' +SELECT * FROM t1 WHERE CONCAT(c1)='ä'; +c1 +ä +SELECT * FROM t1 WHERE CONCAT(c1) LIKE 'ae'; +c1 +ae +SELECT * FROM t1 WHERE CONCAT(c1)='ä' AND CONCAT(c1) LIKE 'ae'; +c1 +EXPLAIN EXTENDED SELECT * FROM t1 WHERE CONCAT(c1)='ä' AND CONCAT(c1) LIKE 'ae'; +id select_type table type possible_keys key key_len ref rows filtered Extra +1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where +Warnings: +Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where concat(`test`.`t1`.`c1`) = 'ä' and concat(`test`.`t1`.`c1`) like 'ae' +DROP TABLE IF EXISTS t1; +# +# End of 10.0 tests +# diff --git a/mysql-test/main/ctype_utf8mb3_uca1400_ai_ci.test b/mysql-test/main/ctype_utf8mb3_uca1400_ai_ci.test new file mode 100644 index 00000000000..3fd5744a46a --- /dev/null +++ b/mysql-test/main/ctype_utf8mb3_uca1400_ai_ci.test @@ -0,0 +1,52 @@ +--echo # +--echo # Start of 5.5 tests +--echo # + +SET NAMES utf8mb3 COLLATE uca1400_ai_ci; +--source include/ctype_special_chars.inc + +--echo # +--echo # End of 5.5 tests +--echo # + + + +--echo # +--echo # Start of 5.6 tests +--echo # + +--echo # +--echo # WL#3664 WEIGHT_STRING +--echo # + +SET NAMES utf8mb3 COLLATE uca1400_ai_ci; +--source include/weight_string.inc +--source include/weight_string_euro.inc +--source include/weight_string_l1.inc + + +--echo # +--echo # End of 5.6 tests +--echo # + + +--echo # +--echo # Start of 10.0 tests +--echo # + +# +# Testing regexp +# +SET NAMES utf8mb3 COLLATE uca1400_ai_ci; +--source include/ctype_regex.inc +--source include/ctype_regex_utf8.inc + +# +# MDEV-7149 Constant condition propagation erroneously applied for LIKE +# +--source include/ctype_like_cond_propagation.inc +--source include/ctype_like_cond_propagation_utf8_german.inc + +--echo # +--echo # End of 10.0 tests +--echo # diff --git a/mysql-test/main/ctype_utf8mb4.result b/mysql-test/main/ctype_utf8mb4.result index 3c91316b18e..a7c69cdaebd 100644 --- a/mysql-test/main/ctype_utf8mb4.result +++ b/mysql-test/main/ctype_utf8mb4.result @@ -1,3 +1,7 @@ +SET character_set_collations= REGEXP_REPLACE(@@character_set_collations, '(utf8mb[34]=[a-z0-9_]*)', ''); +SELECT @@character_set_collations; +@@character_set_collations +ucs2=ucs2_uca1400_ai_ci,utf16=utf16_uca1400_ai_ci,utf32=utf32_uca1400_ai_ci drop table if exists t1,t2; # # Start of 5.5 tests @@ -75,45 +79,6 @@ CONVERT(_koi8r'\xD7\xC1\xD3\xD1' USING utf8mb4) LIKE CONVERT(_koi8r'\xF7\xE1\xF3 select CONVERT(_koi8r'' USING utf8mb4) LIKE CONVERT(_koi8r'' USING utf8mb4); CONVERT(_koi8r'\xF7\xE1\xF3\xF1' USING utf8mb4) LIKE CONVERT(_koi8r'\xD7\xC1\xD3\xD1' USING utf8mb4) 1 -SELECT 'a' = 'a '; -'a' = 'a ' -1 -SELECT 'a\0' < 'a'; -'a\0' < 'a' -1 -SELECT 'a\0' < 'a '; -'a\0' < 'a ' -1 -SELECT 'a\t' < 'a'; -'a\t' < 'a' -1 -SELECT 'a\t' < 'a '; -'a\t' < 'a ' -1 -SELECT 'a' = 'a ' collate utf8mb4_bin; -'a' = 'a ' collate utf8mb4_bin -1 -SELECT 'a\0' < 'a' collate utf8mb4_bin; -'a\0' < 'a' collate utf8mb4_bin -1 -SELECT 'a\0' < 'a ' collate utf8mb4_bin; -'a\0' < 'a ' collate utf8mb4_bin -1 -SELECT 'a\t' < 'a' collate utf8mb4_bin; -'a\t' < 'a' collate utf8mb4_bin -1 -SELECT 'a\t' < 'a ' collate utf8mb4_bin; -'a\t' < 'a ' collate utf8mb4_bin -1 -CREATE TABLE t1 (a char(10) character set utf8mb4 not null); -INSERT INTO t1 VALUES ('a'),('a\0'),('a\t'),('a '); -SELECT hex(a),STRCMP(a,'a'), STRCMP(a,'a ') FROM t1; -hex(a) STRCMP(a,'a') STRCMP(a,'a ') -61 0 0 -6100 -1 -1 -6109 -1 -1 -61 0 0 -DROP TABLE t1; select insert('txs',2,1,'hi'),insert('is ',4,0,'a'),insert('txxxxt',2,4,'es'); insert('txs',2,1,'hi') insert('is ',4,0,'a') insert('txxxxt',2,4,'es') this is test @@ -270,95 +235,6 @@ b select * from t1 where a = 'b' and a != 'b'; a drop table t1; -set names utf8mb4; -drop table if exists t1; -create table t1 as -select repeat(' ', 64) as s1, repeat(' ',64) as s2 -union -select null, null; -show create table t1; -Table Create Table -t1 CREATE TABLE `t1` ( - `s1` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, - `s2` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci -delete from t1; -insert into t1 values('aaa','aaa'); -insert into t1 values('aaa|qqq','qqq'); -insert into t1 values('gheis','^[^a-dXYZ]+$'); -insert into t1 values('aab','^aa?b'); -insert into t1 values('Baaan','^Ba*n'); -insert into t1 values('aaa','qqq|aaa'); -insert into t1 values('qqq','qqq|aaa'); -insert into t1 values('bbb','qqq|aaa'); -insert into t1 values('bbb','qqq'); -insert into t1 values('aaa','aba'); -insert into t1 values(null,'abc'); -insert into t1 values('def',null); -insert into t1 values(null,null); -insert into t1 values('ghi','ghi['); -select HIGH_PRIORITY s1 regexp s2 from t1; -s1 regexp s2 -0 -0 -0 -1 -1 -1 -1 -1 -1 -1 -NULL -NULL -NULL -NULL -drop table t1; -SELECT @@character_set_client, @@collation_connection; -@@character_set_client @@collation_connection -utf8mb4 utf8mb4_general_ci -select 'вася' rlike '\\bвася\\b'; -'вася' rlike '\\bвася\\b' -1 -select 'вася ' rlike '\\bвася\\b'; -'вася ' rlike '\\bвася\\b' -1 -select ' вася' rlike '\\bвася\\b'; -' вася' rlike '\\bвася\\b' -1 -select ' вася ' rlike '\\bвася\\b'; -' вася ' rlike '\\bвася\\b' -1 -select 'вася' rlike '[[:<:]]вася[[:>:]]'; -'вася' rlike '[[:<:]]вася[[:>:]]' -1 -select 'вася ' rlike '[[:<:]]вася[[:>:]]'; -'вася ' rlike '[[:<:]]вася[[:>:]]' -1 -select ' вася' rlike '[[:<:]]вася[[:>:]]'; -' вася' rlike '[[:<:]]вася[[:>:]]' -1 -select ' вася ' rlike '[[:<:]]вася[[:>:]]'; -' вася ' rlike '[[:<:]]вася[[:>:]]' -1 -select 'васяz' rlike '\\bвася\\b'; -'васяz' rlike '\\bвася\\b' -0 -select 'zвася' rlike '\\bвася\\b'; -'zвася' rlike '\\bвася\\b' -0 -select 'zвасяz' rlike '\\bвася\\b'; -'zвасяz' rlike '\\bвася\\b' -0 -select 'васяz' rlike '[[:<:]]вася[[:>:]]'; -'васяz' rlike '[[:<:]]вася[[:>:]]' -0 -select 'zвася' rlike '[[:<:]]вася[[:>:]]'; -'zвася' rlike '[[:<:]]вася[[:>:]]' -0 -select 'zвасяz' rlike '[[:<:]]вася[[:>:]]'; -'zвасяz' rlike '[[:<:]]вася[[:>:]]' -0 CREATE TABLE t1 (a enum ('Y', 'N') DEFAULT 'N' COLLATE utf8mb4_unicode_ci); ALTER TABLE t1 ADD COLUMN b CHAR(20); DROP TABLE t1; @@ -1844,7 +1720,7 @@ SET CHARACTER SET utf8mb4; SHOW VARIABLES LIKE 'character\_set\_%'; Variable_name Value character_set_client utf8mb4 -character_set_collations +character_set_collations ucs2=ucs2_uca1400_ai_ci,utf16=utf16_uca1400_ai_ci,utf32=utf32_uca1400_ai_ci character_set_connection latin1 character_set_database latin1 character_set_filesystem binary @@ -2908,500 +2784,6 @@ DROP TABLE t1; # End of 5.5 tests # # -# WL#3664 WEIGHT_STRING -# -set names utf8mb4; -select @@collation_connection; -@@collation_connection -utf8mb4_general_ci -CREATE TABLE t1 AS SELECT 'a' AS a; -SHOW CREATE TABLE t1; -Table Create Table -t1 CREATE TABLE `t1` ( - `a` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci -CREATE TABLE t2 AS SELECT WEIGHT_STRING(a) AS ws FROM t1; -SHOW CREATE TABLE t2; -Table Create Table -t2 CREATE TABLE `t2` ( - `ws` varbinary(2) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci -SELECT HEX(WEIGHT_STRING(a)) FROM t1; -HEX(WEIGHT_STRING(a)) -0041 -SELECT HEX(ws) FROM t2; -HEX(ws) -0041 -DROP TABLE t2; -DROP TABLE t1; -CREATE TABLE t1 AS SELECT REPEAT('a',5) AS a; -SHOW CREATE TABLE t1; -Table Create Table -t1 CREATE TABLE `t1` ( - `a` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci -CREATE TABLE t2 AS SELECT WEIGHT_STRING(a) AS ws FROM t1; -SHOW CREATE TABLE t2; -Table Create Table -t2 CREATE TABLE `t2` ( - `ws` varbinary(10) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci -SELECT HEX(WEIGHT_STRING(a)) FROM t1; -HEX(WEIGHT_STRING(a)) -00410041004100410041 -SELECT HEX(ws) FROM t2; -HEX(ws) -00410041004100410041 -DROP TABLE t2; -CREATE TABLE t2 AS SELECT WEIGHT_STRING(a AS CHAR(3)) AS ws FROM t1; -SHOW CREATE TABLE t2; -Table Create Table -t2 CREATE TABLE `t2` ( - `ws` varbinary(6) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci -SELECT HEX(WEIGHT_STRING(a AS CHAR(3))) FROM t1; -HEX(WEIGHT_STRING(a AS CHAR(3))) -004100410041 -SELECT HEX(ws) FROM t2; -HEX(ws) -004100410041 -DROP TABLE t2; -CREATE TABLE t2 AS SELECT WEIGHT_STRING(a AS CHAR(10)) AS ws FROM t1; -SHOW CREATE TABLE t2; -Table Create Table -t2 CREATE TABLE `t2` ( - `ws` varbinary(20) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci -SELECT HEX(WEIGHT_STRING(a AS CHAR(10))) FROM t1; -HEX(WEIGHT_STRING(a AS CHAR(10))) -0041004100410041004100200020002000200020 -SELECT HEX(ws) FROM t2; -HEX(ws) -0041004100410041004100200020002000200020 -DROP TABLE t2; -DROP TABLE t1; -select hex(weight_string('a')); -hex(weight_string('a')) -0041 -select hex(weight_string('A')); -hex(weight_string('A')) -0041 -select hex(weight_string('abc')); -hex(weight_string('abc')) -004100420043 -select hex(weight_string('abc' as char(2))); -hex(weight_string('abc' as char(2))) -00410042 -select hex(weight_string('abc' as char(3))); -hex(weight_string('abc' as char(3))) -004100420043 -select hex(weight_string('abc' as char(5))); -hex(weight_string('abc' as char(5))) -00410042004300200020 -select hex(weight_string('abc', 1, 2, 0xC0)); -hex(weight_string('abc', 1, 2, 0xC0)) -00 -select hex(weight_string('abc', 2, 2, 0xC0)); -hex(weight_string('abc', 2, 2, 0xC0)) -0041 -select hex(weight_string('abc', 3, 2, 0xC0)); -hex(weight_string('abc', 3, 2, 0xC0)) -004100 -select hex(weight_string('abc', 4, 2, 0xC0)); -hex(weight_string('abc', 4, 2, 0xC0)) -00410042 -select hex(weight_string('abc', 5, 2, 0xC0)); -hex(weight_string('abc', 5, 2, 0xC0)) -0041004200 -select hex(weight_string('abc',25, 2, 0xC0)); -hex(weight_string('abc',25, 2, 0xC0)) -00410042002000200020002000200020002000200020002000 -select hex(weight_string('abc', 1, 3, 0xC0)); -hex(weight_string('abc', 1, 3, 0xC0)) -00 -select hex(weight_string('abc', 2, 3, 0xC0)); -hex(weight_string('abc', 2, 3, 0xC0)) -0041 -select hex(weight_string('abc', 3, 3, 0xC0)); -hex(weight_string('abc', 3, 3, 0xC0)) -004100 -select hex(weight_string('abc', 4, 3, 0xC0)); -hex(weight_string('abc', 4, 3, 0xC0)) -00410042 -select hex(weight_string('abc', 5, 3, 0xC0)); -hex(weight_string('abc', 5, 3, 0xC0)) -0041004200 -select hex(weight_string('abc',25, 3, 0xC0)); -hex(weight_string('abc',25, 3, 0xC0)) -00410042004300200020002000200020002000200020002000 -select hex(weight_string('abc', 1, 4, 0xC0)); -hex(weight_string('abc', 1, 4, 0xC0)) -00 -select hex(weight_string('abc', 2, 4, 0xC0)); -hex(weight_string('abc', 2, 4, 0xC0)) -0041 -select hex(weight_string('abc', 3, 4, 0xC0)); -hex(weight_string('abc', 3, 4, 0xC0)) -004100 -select hex(weight_string('abc', 4, 4, 0xC0)); -hex(weight_string('abc', 4, 4, 0xC0)) -00410042 -select hex(weight_string('abc', 5, 4, 0xC0)); -hex(weight_string('abc', 5, 4, 0xC0)) -0041004200 -select hex(weight_string('abc',25, 4, 0xC0)); -hex(weight_string('abc',25, 4, 0xC0)) -00410042004300200020002000200020002000200020002000 -select @@collation_connection; -@@collation_connection -utf8mb4_general_ci -select hex(weight_string(cast(_latin1 0x80 as char))); -hex(weight_string(cast(_latin1 0x80 as char))) -20AC -select hex(weight_string(cast(_latin1 0x808080 as char))); -hex(weight_string(cast(_latin1 0x808080 as char))) -20AC20AC20AC -select hex(weight_string(cast(_latin1 0x808080 as char) as char(2))); -hex(weight_string(cast(_latin1 0x808080 as char) as char(2))) -20AC20AC -select hex(weight_string(cast(_latin1 0x808080 as char) as char(3))); -hex(weight_string(cast(_latin1 0x808080 as char) as char(3))) -20AC20AC20AC -select hex(weight_string(cast(_latin1 0x808080 as char) as char(5))); -hex(weight_string(cast(_latin1 0x808080 as char) as char(5))) -20AC20AC20AC00200020 -select hex(weight_string(cast(_latin1 0x808080 as char), 1, 2, 0xC0)); -hex(weight_string(cast(_latin1 0x808080 as char), 1, 2, 0xC0)) -20 -select hex(weight_string(cast(_latin1 0x808080 as char), 2, 2, 0xC0)); -hex(weight_string(cast(_latin1 0x808080 as char), 2, 2, 0xC0)) -20AC -select hex(weight_string(cast(_latin1 0x808080 as char), 3, 2, 0xC0)); -hex(weight_string(cast(_latin1 0x808080 as char), 3, 2, 0xC0)) -20AC20 -select hex(weight_string(cast(_latin1 0x808080 as char), 4, 2, 0xC0)); -hex(weight_string(cast(_latin1 0x808080 as char), 4, 2, 0xC0)) -20AC20AC -select hex(weight_string(cast(_latin1 0x808080 as char), 5, 2, 0xC0)); -hex(weight_string(cast(_latin1 0x808080 as char), 5, 2, 0xC0)) -20AC20AC00 -select hex(weight_string(cast(_latin1 0x808080 as char),25, 2, 0xC0)); -hex(weight_string(cast(_latin1 0x808080 as char),25, 2, 0xC0)) -20AC20AC002000200020002000200020002000200020002000 -select hex(weight_string(cast(_latin1 0x808080 as char), 1, 3, 0xC0)); -hex(weight_string(cast(_latin1 0x808080 as char), 1, 3, 0xC0)) -20 -select hex(weight_string(cast(_latin1 0x808080 as char), 2, 3, 0xC0)); -hex(weight_string(cast(_latin1 0x808080 as char), 2, 3, 0xC0)) -20AC -select hex(weight_string(cast(_latin1 0x808080 as char), 3, 3, 0xC0)); -hex(weight_string(cast(_latin1 0x808080 as char), 3, 3, 0xC0)) -20AC20 -select hex(weight_string(cast(_latin1 0x808080 as char), 4, 3, 0xC0)); -hex(weight_string(cast(_latin1 0x808080 as char), 4, 3, 0xC0)) -20AC20AC -select hex(weight_string(cast(_latin1 0x808080 as char), 5, 3, 0xC0)); -hex(weight_string(cast(_latin1 0x808080 as char), 5, 3, 0xC0)) -20AC20AC20 -select hex(weight_string(cast(_latin1 0x808080 as char),25, 3, 0xC0)); -hex(weight_string(cast(_latin1 0x808080 as char),25, 3, 0xC0)) -20AC20AC20AC00200020002000200020002000200020002000 -select hex(weight_string(cast(_latin1 0x808080 as char), 1, 4, 0xC0)); -hex(weight_string(cast(_latin1 0x808080 as char), 1, 4, 0xC0)) -20 -select hex(weight_string(cast(_latin1 0x808080 as char), 2, 4, 0xC0)); -hex(weight_string(cast(_latin1 0x808080 as char), 2, 4, 0xC0)) -20AC -select hex(weight_string(cast(_latin1 0x808080 as char), 3, 4, 0xC0)); -hex(weight_string(cast(_latin1 0x808080 as char), 3, 4, 0xC0)) -20AC20 -select hex(weight_string(cast(_latin1 0x808080 as char), 4, 4, 0xC0)); -hex(weight_string(cast(_latin1 0x808080 as char), 4, 4, 0xC0)) -20AC20AC -select hex(weight_string(cast(_latin1 0x808080 as char), 5, 4, 0xC0)); -hex(weight_string(cast(_latin1 0x808080 as char), 5, 4, 0xC0)) -20AC20AC20 -select hex(weight_string(cast(_latin1 0x808080 as char),25, 4, 0xC0)); -hex(weight_string(cast(_latin1 0x808080 as char),25, 4, 0xC0)) -20AC20AC20AC00200020002000200020002000200020002000 -select @@collation_connection; -@@collation_connection -utf8mb4_general_ci -select hex(weight_string('a' LEVEL 1)); -hex(weight_string('a' LEVEL 1)) -0041 -select hex(weight_string('A' LEVEL 1)); -hex(weight_string('A' LEVEL 1)) -0041 -select hex(weight_string('abc' LEVEL 1)); -hex(weight_string('abc' LEVEL 1)) -004100420043 -select hex(weight_string('abc' as char(2) LEVEL 1)); -hex(weight_string('abc' as char(2) LEVEL 1)) -00410042 -select hex(weight_string('abc' as char(3) LEVEL 1)); -hex(weight_string('abc' as char(3) LEVEL 1)) -004100420043 -select hex(weight_string('abc' as char(5) LEVEL 1)); -hex(weight_string('abc' as char(5) LEVEL 1)) -00410042004300200020 -select hex(weight_string('abc' as char(5) LEVEL 1 REVERSE)); -hex(weight_string('abc' as char(5) LEVEL 1 REVERSE)) -20002000430042004100 -select hex(weight_string('abc' as char(5) LEVEL 1 DESC)); -hex(weight_string('abc' as char(5) LEVEL 1 DESC)) -FFBEFFBDFFBCFFDFFFDF -select hex(weight_string('abc' as char(5) LEVEL 1 DESC REVERSE)); -hex(weight_string('abc' as char(5) LEVEL 1 DESC REVERSE)) -DFFFDFFFBCFFBDFFBEFF -set @@collation_connection=utf8mb4_bin; -select @@collation_connection; -@@collation_connection -utf8mb4_bin -CREATE TABLE t1 AS SELECT 'a' AS a; -SHOW CREATE TABLE t1; -Table Create Table -t1 CREATE TABLE `t1` ( - `a` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci -CREATE TABLE t2 AS SELECT WEIGHT_STRING(a) AS ws FROM t1; -SHOW CREATE TABLE t2; -Table Create Table -t2 CREATE TABLE `t2` ( - `ws` varbinary(3) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci -SELECT HEX(WEIGHT_STRING(a)) FROM t1; -HEX(WEIGHT_STRING(a)) -000061 -SELECT HEX(ws) FROM t2; -HEX(ws) -000061 -DROP TABLE t2; -DROP TABLE t1; -CREATE TABLE t1 AS SELECT REPEAT('a',5) AS a; -SHOW CREATE TABLE t1; -Table Create Table -t1 CREATE TABLE `t1` ( - `a` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci -CREATE TABLE t2 AS SELECT WEIGHT_STRING(a) AS ws FROM t1; -SHOW CREATE TABLE t2; -Table Create Table -t2 CREATE TABLE `t2` ( - `ws` varbinary(15) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci -SELECT HEX(WEIGHT_STRING(a)) FROM t1; -HEX(WEIGHT_STRING(a)) -000061000061000061000061000061 -SELECT HEX(ws) FROM t2; -HEX(ws) -000061000061000061000061000061 -DROP TABLE t2; -CREATE TABLE t2 AS SELECT WEIGHT_STRING(a AS CHAR(3)) AS ws FROM t1; -SHOW CREATE TABLE t2; -Table Create Table -t2 CREATE TABLE `t2` ( - `ws` varbinary(9) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci -SELECT HEX(WEIGHT_STRING(a AS CHAR(3))) FROM t1; -HEX(WEIGHT_STRING(a AS CHAR(3))) -000061000061000061 -SELECT HEX(ws) FROM t2; -HEX(ws) -000061000061000061 -DROP TABLE t2; -CREATE TABLE t2 AS SELECT WEIGHT_STRING(a AS CHAR(10)) AS ws FROM t1; -SHOW CREATE TABLE t2; -Table Create Table -t2 CREATE TABLE `t2` ( - `ws` varbinary(30) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci -SELECT HEX(WEIGHT_STRING(a AS CHAR(10))) FROM t1; -HEX(WEIGHT_STRING(a AS CHAR(10))) -000061000061000061000061000061000020000020000020000020000020 -SELECT HEX(ws) FROM t2; -HEX(ws) -000061000061000061000061000061000020000020000020000020000020 -DROP TABLE t2; -DROP TABLE t1; -select hex(weight_string('a')); -hex(weight_string('a')) -000061 -select hex(weight_string('A')); -hex(weight_string('A')) -000041 -select hex(weight_string('abc')); -hex(weight_string('abc')) -000061000062000063 -select hex(weight_string('abc' as char(2))); -hex(weight_string('abc' as char(2))) -000061000062 -select hex(weight_string('abc' as char(3))); -hex(weight_string('abc' as char(3))) -000061000062000063 -select hex(weight_string('abc' as char(5))); -hex(weight_string('abc' as char(5))) -000061000062000063000020000020 -select hex(weight_string('abc', 1, 2, 0xC0)); -hex(weight_string('abc', 1, 2, 0xC0)) -00 -select hex(weight_string('abc', 2, 2, 0xC0)); -hex(weight_string('abc', 2, 2, 0xC0)) -0000 -select hex(weight_string('abc', 3, 2, 0xC0)); -hex(weight_string('abc', 3, 2, 0xC0)) -000061 -select hex(weight_string('abc', 4, 2, 0xC0)); -hex(weight_string('abc', 4, 2, 0xC0)) -00006100 -select hex(weight_string('abc', 5, 2, 0xC0)); -hex(weight_string('abc', 5, 2, 0xC0)) -0000610000 -select hex(weight_string('abc',25, 2, 0xC0)); -hex(weight_string('abc',25, 2, 0xC0)) -00006100006200002000002000002000002000002000002000 -select hex(weight_string('abc', 1, 3, 0xC0)); -hex(weight_string('abc', 1, 3, 0xC0)) -00 -select hex(weight_string('abc', 2, 3, 0xC0)); -hex(weight_string('abc', 2, 3, 0xC0)) -0000 -select hex(weight_string('abc', 3, 3, 0xC0)); -hex(weight_string('abc', 3, 3, 0xC0)) -000061 -select hex(weight_string('abc', 4, 3, 0xC0)); -hex(weight_string('abc', 4, 3, 0xC0)) -00006100 -select hex(weight_string('abc', 5, 3, 0xC0)); -hex(weight_string('abc', 5, 3, 0xC0)) -0000610000 -select hex(weight_string('abc',25, 3, 0xC0)); -hex(weight_string('abc',25, 3, 0xC0)) -00006100006200006300002000002000002000002000002000 -select hex(weight_string('abc', 1, 4, 0xC0)); -hex(weight_string('abc', 1, 4, 0xC0)) -00 -select hex(weight_string('abc', 2, 4, 0xC0)); -hex(weight_string('abc', 2, 4, 0xC0)) -0000 -select hex(weight_string('abc', 3, 4, 0xC0)); -hex(weight_string('abc', 3, 4, 0xC0)) -000061 -select hex(weight_string('abc', 4, 4, 0xC0)); -hex(weight_string('abc', 4, 4, 0xC0)) -00006100 -select hex(weight_string('abc', 5, 4, 0xC0)); -hex(weight_string('abc', 5, 4, 0xC0)) -0000610000 -select hex(weight_string('abc',25, 4, 0xC0)); -hex(weight_string('abc',25, 4, 0xC0)) -00006100006200006300002000002000002000002000002000 -select @@collation_connection; -@@collation_connection -utf8mb4_bin -select hex(weight_string(cast(_latin1 0x80 as char))); -hex(weight_string(cast(_latin1 0x80 as char))) -0020AC -select hex(weight_string(cast(_latin1 0x808080 as char))); -hex(weight_string(cast(_latin1 0x808080 as char))) -0020AC0020AC0020AC -select hex(weight_string(cast(_latin1 0x808080 as char) as char(2))); -hex(weight_string(cast(_latin1 0x808080 as char) as char(2))) -0020AC0020AC -select hex(weight_string(cast(_latin1 0x808080 as char) as char(3))); -hex(weight_string(cast(_latin1 0x808080 as char) as char(3))) -0020AC0020AC0020AC -select hex(weight_string(cast(_latin1 0x808080 as char) as char(5))); -hex(weight_string(cast(_latin1 0x808080 as char) as char(5))) -0020AC0020AC0020AC000020000020 -select hex(weight_string(cast(_latin1 0x808080 as char), 1, 2, 0xC0)); -hex(weight_string(cast(_latin1 0x808080 as char), 1, 2, 0xC0)) -00 -select hex(weight_string(cast(_latin1 0x808080 as char), 2, 2, 0xC0)); -hex(weight_string(cast(_latin1 0x808080 as char), 2, 2, 0xC0)) -0020 -select hex(weight_string(cast(_latin1 0x808080 as char), 3, 2, 0xC0)); -hex(weight_string(cast(_latin1 0x808080 as char), 3, 2, 0xC0)) -0020AC -select hex(weight_string(cast(_latin1 0x808080 as char), 4, 2, 0xC0)); -hex(weight_string(cast(_latin1 0x808080 as char), 4, 2, 0xC0)) -0020AC00 -select hex(weight_string(cast(_latin1 0x808080 as char), 5, 2, 0xC0)); -hex(weight_string(cast(_latin1 0x808080 as char), 5, 2, 0xC0)) -0020AC0020 -select hex(weight_string(cast(_latin1 0x808080 as char),25, 2, 0xC0)); -hex(weight_string(cast(_latin1 0x808080 as char),25, 2, 0xC0)) -0020AC0020AC00002000002000002000002000002000002000 -select hex(weight_string(cast(_latin1 0x808080 as char), 1, 3, 0xC0)); -hex(weight_string(cast(_latin1 0x808080 as char), 1, 3, 0xC0)) -00 -select hex(weight_string(cast(_latin1 0x808080 as char), 2, 3, 0xC0)); -hex(weight_string(cast(_latin1 0x808080 as char), 2, 3, 0xC0)) -0020 -select hex(weight_string(cast(_latin1 0x808080 as char), 3, 3, 0xC0)); -hex(weight_string(cast(_latin1 0x808080 as char), 3, 3, 0xC0)) -0020AC -select hex(weight_string(cast(_latin1 0x808080 as char), 4, 3, 0xC0)); -hex(weight_string(cast(_latin1 0x808080 as char), 4, 3, 0xC0)) -0020AC00 -select hex(weight_string(cast(_latin1 0x808080 as char), 5, 3, 0xC0)); -hex(weight_string(cast(_latin1 0x808080 as char), 5, 3, 0xC0)) -0020AC0020 -select hex(weight_string(cast(_latin1 0x808080 as char),25, 3, 0xC0)); -hex(weight_string(cast(_latin1 0x808080 as char),25, 3, 0xC0)) -0020AC0020AC0020AC00002000002000002000002000002000 -select hex(weight_string(cast(_latin1 0x808080 as char), 1, 4, 0xC0)); -hex(weight_string(cast(_latin1 0x808080 as char), 1, 4, 0xC0)) -00 -select hex(weight_string(cast(_latin1 0x808080 as char), 2, 4, 0xC0)); -hex(weight_string(cast(_latin1 0x808080 as char), 2, 4, 0xC0)) -0020 -select hex(weight_string(cast(_latin1 0x808080 as char), 3, 4, 0xC0)); -hex(weight_string(cast(_latin1 0x808080 as char), 3, 4, 0xC0)) -0020AC -select hex(weight_string(cast(_latin1 0x808080 as char), 4, 4, 0xC0)); -hex(weight_string(cast(_latin1 0x808080 as char), 4, 4, 0xC0)) -0020AC00 -select hex(weight_string(cast(_latin1 0x808080 as char), 5, 4, 0xC0)); -hex(weight_string(cast(_latin1 0x808080 as char), 5, 4, 0xC0)) -0020AC0020 -select hex(weight_string(cast(_latin1 0x808080 as char),25, 4, 0xC0)); -hex(weight_string(cast(_latin1 0x808080 as char),25, 4, 0xC0)) -0020AC0020AC0020AC00002000002000002000002000002000 -select @@collation_connection; -@@collation_connection -utf8mb4_bin -select hex(weight_string('a' LEVEL 1)); -hex(weight_string('a' LEVEL 1)) -000061 -select hex(weight_string('A' LEVEL 1)); -hex(weight_string('A' LEVEL 1)) -000041 -select hex(weight_string('abc' LEVEL 1)); -hex(weight_string('abc' LEVEL 1)) -000061000062000063 -select hex(weight_string('abc' as char(2) LEVEL 1)); -hex(weight_string('abc' as char(2) LEVEL 1)) -000061000062 -select hex(weight_string('abc' as char(3) LEVEL 1)); -hex(weight_string('abc' as char(3) LEVEL 1)) -000061000062000063 -select hex(weight_string('abc' as char(5) LEVEL 1)); -hex(weight_string('abc' as char(5) LEVEL 1)) -000061000062000063000020000020 -select hex(weight_string('abc' as char(5) LEVEL 1 REVERSE)); -hex(weight_string('abc' as char(5) LEVEL 1 REVERSE)) -200000200000630000620000610000 -select hex(weight_string('abc' as char(5) LEVEL 1 DESC)); -hex(weight_string('abc' as char(5) LEVEL 1 DESC)) -FFFF9EFFFF9DFFFF9CFFFFDFFFFFDF -select hex(weight_string('abc' as char(5) LEVEL 1 DESC REVERSE)); -hex(weight_string('abc' as char(5) LEVEL 1 DESC REVERSE)) -DFFFFFDFFFFF9CFFFF9DFFFF9EFFFF -# -# End of 5.6 tests -# -# # Start of 10.0 tests # # diff --git a/mysql-test/main/ctype_utf8mb4.test b/mysql-test/main/ctype_utf8mb4.test index 46a9c14dec0..f213ac63c4d 100644 --- a/mysql-test/main/ctype_utf8mb4.test +++ b/mysql-test/main/ctype_utf8mb4.test @@ -10,6 +10,16 @@ --source include/have_innodb.inc --source include/default_optimizer_switch.inc +# +# Remove the 'utf8mb3=xxx' and 'utf8mb4=xxx' substrings +# from @@character_set_collations to change the default +# utf8mb3 and utf8mb4 collations to the hard-coded defaults +# utf8mb3_general_ci and utf8mb4_general_ci +# +SET character_set_collations= REGEXP_REPLACE(@@character_set_collations, '(utf8mb[34]=[a-z0-9_]*)', ''); +SELECT @@character_set_collations; + + --disable_warnings drop table if exists t1,t2; --enable_warnings @@ -54,32 +64,6 @@ select convert(_latin1'G select CONVERT(_koi8r'' USING utf8mb4) LIKE CONVERT(_koi8r'' USING utf8mb4); select CONVERT(_koi8r'' USING utf8mb4) LIKE CONVERT(_koi8r'' USING utf8mb4); -# -# Check the following: -# "a" == "a " -# "a\0" < "a" -# "a\0" < "a " - -SELECT 'a' = 'a '; -SELECT 'a\0' < 'a'; -SELECT 'a\0' < 'a '; -SELECT 'a\t' < 'a'; -SELECT 'a\t' < 'a '; - -# -# The same for binary collation -# -SELECT 'a' = 'a ' collate utf8mb4_bin; -SELECT 'a\0' < 'a' collate utf8mb4_bin; -SELECT 'a\0' < 'a ' collate utf8mb4_bin; -SELECT 'a\t' < 'a' collate utf8mb4_bin; -SELECT 'a\t' < 'a ' collate utf8mb4_bin; - -CREATE TABLE t1 (a char(10) character set utf8mb4 not null); -INSERT INTO t1 VALUES ('a'),('a\0'),('a\t'),('a '); -SELECT hex(a),STRCMP(a,'a'), STRCMP(a,'a ') FROM t1; -DROP TABLE t1; - # # Fix this, it should return 1: # @@ -198,13 +182,6 @@ select * from t1 where a = 'b' and a = 'b'; select * from t1 where a = 'b' and a != 'b'; drop table t1; -# -# Testing regexp -# -set names utf8mb4; ---source include/ctype_regex.inc ---source include/ctype_regex_utf8.inc - # # Bug #4555 # ALTER TABLE crashes mysqld with enum column collated utf8mb4_unicode_ci @@ -1880,24 +1857,6 @@ DROP TABLE t1; --echo # ---echo # ---echo # WL#3664 WEIGHT_STRING ---echo # - -set names utf8mb4; ---source include/weight_string.inc ---source include/weight_string_euro.inc ---source include/weight_string_l1.inc - -set @@collation_connection=utf8mb4_bin; ---source include/weight_string.inc ---source include/weight_string_euro.inc ---source include/weight_string_l1.inc - ---echo # ---echo # End of 5.6 tests ---echo # - --echo # --echo # Start of 10.0 tests --echo # diff --git a/mysql-test/main/ctype_utf8mb4_bin.result b/mysql-test/main/ctype_utf8mb4_bin.result new file mode 100644 index 00000000000..1badecd3205 --- /dev/null +++ b/mysql-test/main/ctype_utf8mb4_bin.result @@ -0,0 +1,622 @@ +# +# Start of 5.5 tests +# +SET NAMES utf8mb4 COLLATE utf8mb4_bin; +SELECT COLLATION('a'); +COLLATION('a') +utf8mb4_bin +SELECT 'a' = 'a ' AS c; +c +1 +SELECT 'a\0' = 'a' AS c; +c +0 +SELECT 'a\0' = 'a ' AS c; +c +0 +SELECT 'a\t' = 'a' AS c; +c +0 +SELECT 'a\t' = 'a ' AS c; +c +0 +SELECT 'a' < 'a ' AS c; +c +0 +SELECT 'a\0' < 'a' AS c; +c +1 +SELECT 'a\0' < 'a ' AS c; +c +1 +SELECT 'a\t' < 'a' AS c; +c +1 +SELECT 'a\t' < 'a ' AS c; +c +1 +SELECT 'a' > 'a ' AS c; +c +0 +SELECT 'a\0' > 'a' AS c; +c +0 +SELECT 'a\0' > 'a ' AS c; +c +0 +SELECT 'a\t' > 'a' AS c; +c +0 +SELECT 'a\t' > 'a ' AS c; +c +0 +CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS a LIMIT 0; +EXECUTE IMMEDIATE +REPLACE(REPLACE( +"ALTER TABLE t1 ADD a_readable " + "TEXT CHARACTER SET latin1 COLLATE DEFAULT " + "GENERATED ALWAYS AS " + "(RPAD(QUOTE(REGEXP_REPLACE(t1.a, '(\\\\x{00}|\\\\x{09})', '.')), 10))", +'DEFAULT', collation('a')), +'latin1', charset('a')); +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `a` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL, + `a_readable` text CHARACTER SET utf8mb4 COLLATE utf8mb4_bin GENERATED ALWAYS AS (rpad(quote(regexp_replace(`a`,'(\\x{00}|\\x{09})','.')),10)) VIRTUAL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci +INSERT INTO t1 (a) VALUES ('a'),('a\0'),('a\t'),('a '); +SELECT hex(a),STRCMP(a,'a'), STRCMP(a,'a ') FROM t1; +hex(a) STRCMP(a,'a') STRCMP(a,'a ') +61 0 0 +6100 -1 -1 +6109 -1 -1 +6120 0 0 +SELECT HEX(a), a_readable FROM t1 ORDER BY a, BINARY a; +HEX(a) a_readable +6100 'a.' +6109 'a.' +61 'a' +6120 'a ' +SELECT +HEX(t1.a) AS t1a, +CASE STRCMP(t1.a, t2.a) WHEN -1 THEN '<' WHEN 1 THEN '>' ELSE '=' END AS cmp, +HEX(t2.a) AS t2a, +t1.a_readable, +t2.a_readable +FROM t1 t1, t1 t2 +ORDER BY BINARY t1.a, BINARY t2.a; +t1a cmp t2a a_readable a_readable +61 = 61 'a' 'a' +61 > 6100 'a' 'a.' +61 > 6109 'a' 'a.' +61 = 6120 'a' 'a ' +6100 < 61 'a.' 'a' +6100 = 6100 'a.' 'a.' +6100 < 6109 'a.' 'a.' +6100 < 6120 'a.' 'a ' +6109 < 61 'a.' 'a' +6109 > 6100 'a.' 'a.' +6109 = 6109 'a.' 'a.' +6109 < 6120 'a.' 'a ' +6120 = 61 'a ' 'a' +6120 > 6100 'a ' 'a.' +6120 > 6109 'a ' 'a.' +6120 = 6120 'a ' 'a ' +DROP TABLE t1; +# +# End of 5.5 tests +# +# +# Start of 5.6 tests +# +# +# WL#3664 WEIGHT_STRING +# +SET NAMES utf8mb4 COLLATE utf8mb4_bin; +select @@collation_connection; +@@collation_connection +utf8mb4_bin +CREATE TABLE t1 AS SELECT 'a' AS a; +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `a` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci +CREATE TABLE t2 AS SELECT WEIGHT_STRING(a) AS ws FROM t1; +SHOW CREATE TABLE t2; +Table Create Table +t2 CREATE TABLE `t2` ( + `ws` varbinary(3) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci +SELECT HEX(WEIGHT_STRING(a)) FROM t1; +HEX(WEIGHT_STRING(a)) +000061 +SELECT HEX(ws) FROM t2; +HEX(ws) +000061 +DROP TABLE t2; +DROP TABLE t1; +CREATE TABLE t1 AS SELECT REPEAT('a',5) AS a; +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `a` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci +CREATE TABLE t2 AS SELECT WEIGHT_STRING(a) AS ws FROM t1; +SHOW CREATE TABLE t2; +Table Create Table +t2 CREATE TABLE `t2` ( + `ws` varbinary(15) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci +SELECT HEX(WEIGHT_STRING(a)) FROM t1; +HEX(WEIGHT_STRING(a)) +000061000061000061000061000061 +SELECT HEX(ws) FROM t2; +HEX(ws) +000061000061000061000061000061 +DROP TABLE t2; +CREATE TABLE t2 AS SELECT WEIGHT_STRING(a AS CHAR(3)) AS ws FROM t1; +SHOW CREATE TABLE t2; +Table Create Table +t2 CREATE TABLE `t2` ( + `ws` varbinary(9) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci +SELECT HEX(WEIGHT_STRING(a AS CHAR(3))) FROM t1; +HEX(WEIGHT_STRING(a AS CHAR(3))) +000061000061000061 +SELECT HEX(ws) FROM t2; +HEX(ws) +000061000061000061 +DROP TABLE t2; +CREATE TABLE t2 AS SELECT WEIGHT_STRING(a AS CHAR(10)) AS ws FROM t1; +SHOW CREATE TABLE t2; +Table Create Table +t2 CREATE TABLE `t2` ( + `ws` varbinary(30) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci +SELECT HEX(WEIGHT_STRING(a AS CHAR(10))) FROM t1; +HEX(WEIGHT_STRING(a AS CHAR(10))) +000061000061000061000061000061000020000020000020000020000020 +SELECT HEX(ws) FROM t2; +HEX(ws) +000061000061000061000061000061000020000020000020000020000020 +DROP TABLE t2; +DROP TABLE t1; +select hex(weight_string('a')); +hex(weight_string('a')) +000061 +select hex(weight_string('A')); +hex(weight_string('A')) +000041 +select hex(weight_string('abc')); +hex(weight_string('abc')) +000061000062000063 +select hex(weight_string('abc' as char(2))); +hex(weight_string('abc' as char(2))) +000061000062 +select hex(weight_string('abc' as char(3))); +hex(weight_string('abc' as char(3))) +000061000062000063 +select hex(weight_string('abc' as char(5))); +hex(weight_string('abc' as char(5))) +000061000062000063000020000020 +select hex(weight_string('abc', 1, 2, 0xC0)); +hex(weight_string('abc', 1, 2, 0xC0)) +00 +select hex(weight_string('abc', 2, 2, 0xC0)); +hex(weight_string('abc', 2, 2, 0xC0)) +0000 +select hex(weight_string('abc', 3, 2, 0xC0)); +hex(weight_string('abc', 3, 2, 0xC0)) +000061 +select hex(weight_string('abc', 4, 2, 0xC0)); +hex(weight_string('abc', 4, 2, 0xC0)) +00006100 +select hex(weight_string('abc', 5, 2, 0xC0)); +hex(weight_string('abc', 5, 2, 0xC0)) +0000610000 +select hex(weight_string('abc',25, 2, 0xC0)); +hex(weight_string('abc',25, 2, 0xC0)) +00006100006200002000002000002000002000002000002000 +select hex(weight_string('abc', 1, 3, 0xC0)); +hex(weight_string('abc', 1, 3, 0xC0)) +00 +select hex(weight_string('abc', 2, 3, 0xC0)); +hex(weight_string('abc', 2, 3, 0xC0)) +0000 +select hex(weight_string('abc', 3, 3, 0xC0)); +hex(weight_string('abc', 3, 3, 0xC0)) +000061 +select hex(weight_string('abc', 4, 3, 0xC0)); +hex(weight_string('abc', 4, 3, 0xC0)) +00006100 +select hex(weight_string('abc', 5, 3, 0xC0)); +hex(weight_string('abc', 5, 3, 0xC0)) +0000610000 +select hex(weight_string('abc',25, 3, 0xC0)); +hex(weight_string('abc',25, 3, 0xC0)) +00006100006200006300002000002000002000002000002000 +select hex(weight_string('abc', 1, 4, 0xC0)); +hex(weight_string('abc', 1, 4, 0xC0)) +00 +select hex(weight_string('abc', 2, 4, 0xC0)); +hex(weight_string('abc', 2, 4, 0xC0)) +0000 +select hex(weight_string('abc', 3, 4, 0xC0)); +hex(weight_string('abc', 3, 4, 0xC0)) +000061 +select hex(weight_string('abc', 4, 4, 0xC0)); +hex(weight_string('abc', 4, 4, 0xC0)) +00006100 +select hex(weight_string('abc', 5, 4, 0xC0)); +hex(weight_string('abc', 5, 4, 0xC0)) +0000610000 +select hex(weight_string('abc',25, 4, 0xC0)); +hex(weight_string('abc',25, 4, 0xC0)) +00006100006200006300002000002000002000002000002000 +select @@collation_connection; +@@collation_connection +utf8mb4_bin +select hex(weight_string(cast(_latin1 0x80 as char))); +hex(weight_string(cast(_latin1 0x80 as char))) +0020AC +select hex(weight_string(cast(_latin1 0x808080 as char))); +hex(weight_string(cast(_latin1 0x808080 as char))) +0020AC0020AC0020AC +select hex(weight_string(cast(_latin1 0x808080 as char) as char(2))); +hex(weight_string(cast(_latin1 0x808080 as char) as char(2))) +0020AC0020AC +select hex(weight_string(cast(_latin1 0x808080 as char) as char(3))); +hex(weight_string(cast(_latin1 0x808080 as char) as char(3))) +0020AC0020AC0020AC +select hex(weight_string(cast(_latin1 0x808080 as char) as char(5))); +hex(weight_string(cast(_latin1 0x808080 as char) as char(5))) +0020AC0020AC0020AC000020000020 +select hex(weight_string(cast(_latin1 0x808080 as char), 1, 2, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char), 1, 2, 0xC0)) +00 +select hex(weight_string(cast(_latin1 0x808080 as char), 2, 2, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char), 2, 2, 0xC0)) +0020 +select hex(weight_string(cast(_latin1 0x808080 as char), 3, 2, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char), 3, 2, 0xC0)) +0020AC +select hex(weight_string(cast(_latin1 0x808080 as char), 4, 2, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char), 4, 2, 0xC0)) +0020AC00 +select hex(weight_string(cast(_latin1 0x808080 as char), 5, 2, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char), 5, 2, 0xC0)) +0020AC0020 +select hex(weight_string(cast(_latin1 0x808080 as char),25, 2, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char),25, 2, 0xC0)) +0020AC0020AC00002000002000002000002000002000002000 +select hex(weight_string(cast(_latin1 0x808080 as char), 1, 3, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char), 1, 3, 0xC0)) +00 +select hex(weight_string(cast(_latin1 0x808080 as char), 2, 3, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char), 2, 3, 0xC0)) +0020 +select hex(weight_string(cast(_latin1 0x808080 as char), 3, 3, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char), 3, 3, 0xC0)) +0020AC +select hex(weight_string(cast(_latin1 0x808080 as char), 4, 3, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char), 4, 3, 0xC0)) +0020AC00 +select hex(weight_string(cast(_latin1 0x808080 as char), 5, 3, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char), 5, 3, 0xC0)) +0020AC0020 +select hex(weight_string(cast(_latin1 0x808080 as char),25, 3, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char),25, 3, 0xC0)) +0020AC0020AC0020AC00002000002000002000002000002000 +select hex(weight_string(cast(_latin1 0x808080 as char), 1, 4, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char), 1, 4, 0xC0)) +00 +select hex(weight_string(cast(_latin1 0x808080 as char), 2, 4, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char), 2, 4, 0xC0)) +0020 +select hex(weight_string(cast(_latin1 0x808080 as char), 3, 4, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char), 3, 4, 0xC0)) +0020AC +select hex(weight_string(cast(_latin1 0x808080 as char), 4, 4, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char), 4, 4, 0xC0)) +0020AC00 +select hex(weight_string(cast(_latin1 0x808080 as char), 5, 4, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char), 5, 4, 0xC0)) +0020AC0020 +select hex(weight_string(cast(_latin1 0x808080 as char),25, 4, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char),25, 4, 0xC0)) +0020AC0020AC0020AC00002000002000002000002000002000 +select @@collation_connection; +@@collation_connection +utf8mb4_bin +select hex(weight_string('a' LEVEL 1)); +hex(weight_string('a' LEVEL 1)) +000061 +select hex(weight_string('A' LEVEL 1)); +hex(weight_string('A' LEVEL 1)) +000041 +select hex(weight_string('abc' LEVEL 1)); +hex(weight_string('abc' LEVEL 1)) +000061000062000063 +select hex(weight_string('abc' as char(2) LEVEL 1)); +hex(weight_string('abc' as char(2) LEVEL 1)) +000061000062 +select hex(weight_string('abc' as char(3) LEVEL 1)); +hex(weight_string('abc' as char(3) LEVEL 1)) +000061000062000063 +select hex(weight_string('abc' as char(5) LEVEL 1)); +hex(weight_string('abc' as char(5) LEVEL 1)) +000061000062000063000020000020 +select hex(weight_string('abc' as char(5) LEVEL 1 REVERSE)); +hex(weight_string('abc' as char(5) LEVEL 1 REVERSE)) +200000200000630000620000610000 +select hex(weight_string('abc' as char(5) LEVEL 1 DESC)); +hex(weight_string('abc' as char(5) LEVEL 1 DESC)) +FFFF9EFFFF9DFFFF9CFFFFDFFFFFDF +select hex(weight_string('abc' as char(5) LEVEL 1 DESC REVERSE)); +hex(weight_string('abc' as char(5) LEVEL 1 DESC REVERSE)) +DFFFFFDFFFFF9CFFFF9DFFFF9EFFFF +# +# End of 5.6 tests +# +# +# Start of 10.0 tests +# +SET NAMES utf8mb4 COLLATE utf8mb4_bin; +# +# Bug#31081 server crash in regexp function +# +drop table if exists t1; +create table t1 as +select repeat(' ', 64) as s1, repeat(' ',64) as s2 +union +select null, null; +show create table t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `s1` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL, + `s2` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci +delete from t1; +insert into t1 values('aaa','aaa'); +insert into t1 values('aaa|qqq','qqq'); +insert into t1 values('gheis','^[^a-dXYZ]+$'); +insert into t1 values('aab','^aa?b'); +insert into t1 values('Baaan','^Ba*n'); +insert into t1 values('aaa','qqq|aaa'); +insert into t1 values('qqq','qqq|aaa'); +insert into t1 values('bbb','qqq|aaa'); +insert into t1 values('bbb','qqq'); +insert into t1 values('aaa','aba'); +insert into t1 values(null,'abc'); +insert into t1 values('def',null); +insert into t1 values(null,null); +insert into t1 values('ghi','ghi['); +select HIGH_PRIORITY s1 regexp s2 from t1; +s1 regexp s2 +0 +0 +0 +1 +1 +1 +1 +1 +1 +1 +NULL +NULL +NULL +NULL +drop table t1; +# +# Bug #3928 regexp [[:>:]] and UTF-8 +# +SELECT @@character_set_client, @@collation_connection; +@@character_set_client @@collation_connection +utf8mb4 utf8mb4_bin +# This should return TRUE +select 'вася' rlike '\\bвася\\b'; +'вася' rlike '\\bвася\\b' +1 +select 'вася ' rlike '\\bвася\\b'; +'вася ' rlike '\\bвася\\b' +1 +select ' вася' rlike '\\bвася\\b'; +' вася' rlike '\\bвася\\b' +1 +select ' вася ' rlike '\\bвася\\b'; +' вася ' rlike '\\bвася\\b' +1 +select 'вася' rlike '[[:<:]]вася[[:>:]]'; +'вася' rlike '[[:<:]]вася[[:>:]]' +1 +select 'вася ' rlike '[[:<:]]вася[[:>:]]'; +'вася ' rlike '[[:<:]]вася[[:>:]]' +1 +select ' вася' rlike '[[:<:]]вася[[:>:]]'; +' вася' rlike '[[:<:]]вася[[:>:]]' +1 +select ' вася ' rlike '[[:<:]]вася[[:>:]]'; +' вася ' rlike '[[:<:]]вася[[:>:]]' +1 +# This should return FALSE +select 'васяz' rlike '\\bвася\\b'; +'васяz' rlike '\\bвася\\b' +0 +select 'zвася' rlike '\\bвася\\b'; +'zвася' rlike '\\bвася\\b' +0 +select 'zвасяz' rlike '\\bвася\\b'; +'zвасяz' rlike '\\bвася\\b' +0 +select 'васяz' rlike '[[:<:]]вася[[:>:]]'; +'васяz' rlike '[[:<:]]вася[[:>:]]' +0 +select 'zвася' rlike '[[:<:]]вася[[:>:]]'; +'zвася' rlike '[[:<:]]вася[[:>:]]' +0 +select 'zвасяz' rlike '[[:<:]]вася[[:>:]]'; +'zвасяz' rlike '[[:<:]]вася[[:>:]]' +0 +# +# MDEV-7149 Constant condition propagation erroneously applied for LIKE +# +CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS c1 LIMIT 0; +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `c1` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci +INSERT INTO t1 VALUES ('a'),('a '); +SELECT * FROM t1 WHERE CONCAT(c1)='a'; +c1 +a +a +SELECT * FROM t1 WHERE CONCAT(c1) LIKE 'a '; +c1 +a +SELECT * FROM t1 WHERE CONCAT(c1)='a' AND CONCAT(c1) LIKE 'a '; +c1 +a +EXPLAIN EXTENDED SELECT * FROM t1 WHERE CONCAT(c1)='a' AND CONCAT(c1) LIKE 'a '; +id select_type table type possible_keys key key_len ref rows filtered Extra +1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where +Warnings: +Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where concat(`test`.`t1`.`c1`) = 'a' and concat(`test`.`t1`.`c1`) like 'a ' +DROP TABLE t1; +CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS c1 LIMIT 0; +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `c1` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci +INSERT INTO t1 VALUES ('a'),('a '); +SELECT * FROM t1 WHERE 'a'=CONCAT(c1); +c1 +a +a +SELECT * FROM t1 WHERE 'a ' LIKE CONCAT(c1); +c1 +a +SELECT * FROM t1 WHERE 'a'=CONCAT(c1) AND 'a ' LIKE CONCAT(c1); +c1 +a +EXPLAIN EXTENDED SELECT * FROM t1 WHERE 'a'=CONCAT(c1) AND 'a ' LIKE CONCAT(c1); +id select_type table type possible_keys key key_len ref rows filtered Extra +1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where +Warnings: +Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where 'a' = concat(`test`.`t1`.`c1`) and 'a ' like concat(`test`.`t1`.`c1`) +DROP TABLE t1; +CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS c1 LIMIT 0; +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `c1` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci +INSERT INTO t1 VALUES ('%'),('% '); +SELECT * FROM t1 WHERE '% '=CONCAT(c1); +c1 +% +% +SELECT * FROM t1 WHERE 'a' LIKE CONCAT(c1); +c1 +% +SELECT * FROM t1 WHERE '% '=CONCAT(c1) AND 'a' LIKE CONCAT(c1); +c1 +% +EXPLAIN EXTENDED SELECT * FROM t1 WHERE '% '=CONCAT(c1) AND 'a' LIKE CONCAT(c1); +id select_type table type possible_keys key key_len ref rows filtered Extra +1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where +Warnings: +Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where '% ' = concat(`test`.`t1`.`c1`) and 'a' like concat(`test`.`t1`.`c1`) +DROP TABLE t1; +CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS c1 LIMIT 0; +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `c1` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci +INSERT INTO t1 VALUES ('%'),('% '); +SELECT * FROM t1 WHERE '%'=CONCAT(c1); +c1 +% +% +SELECT * FROM t1 WHERE 'a' LIKE CONCAT(c1); +c1 +% +SELECT * FROM t1 WHERE '%'=CONCAT(c1) AND 'a' LIKE CONCAT(c1); +c1 +% +EXPLAIN EXTENDED SELECT * FROM t1 WHERE '%'=CONCAT(c1) AND 'a' LIKE CONCAT(c1); +id select_type table type possible_keys key key_len ref rows filtered Extra +1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where +Warnings: +Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where '%' = concat(`test`.`t1`.`c1`) and 'a' like concat(`test`.`t1`.`c1`) +DROP TABLE t1; +# +# MDEV-8694 Wrong result for SELECT..WHERE a NOT LIKE 'a ' AND a='a' +# +CREATE TABLE t1 AS SELECT SPACE(10) AS a LIMIT 0; +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `a` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci +INSERT INTO t1 VALUES ('a'),('a '); +SELECT a, LENGTH(a) FROM t1 WHERE a NOT LIKE 'a '; +a LENGTH(a) +a 1 +SELECT a, LENGTH(a) FROM t1 WHERE a NOT LIKE 'a ' AND a='a'; +a LENGTH(a) +a 1 +EXPLAIN EXTENDED SELECT a, LENGTH(a) FROM t1 WHERE a NOT LIKE 'a ' AND a='a'; +id select_type table type possible_keys key key_len ref rows filtered Extra +1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where +Warnings: +Note 1003 select `test`.`t1`.`a` AS `a`,octet_length(`test`.`t1`.`a`) AS `LENGTH(a)` from `test`.`t1` where `test`.`t1`.`a` = 'a' and `test`.`t1`.`a` not like 'a ' +DROP TABLE t1; +# +# End of MDEV-8694 +# +# +# MDEV-7149 Constant condition propagation erroneously applied for LIKE +# +CREATE TABLE t1 AS SELECT REPEAT('a',10) AS c1 LIMIT 0; +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `c1` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci +INSERT INTO t1 VALUES ('ae'),('ä'); +SELECT * FROM t1 WHERE c1='ä'; +c1 +ä +SELECT * FROM t1 WHERE c1 LIKE 'ae'; +c1 +ae +SELECT * FROM t1 WHERE c1='ä' AND c1 LIKE 'ae'; +c1 +EXPLAIN EXTENDED SELECT * FROM t1 WHERE c1='ä' AND c1 LIKE 'ae'; +id select_type table type possible_keys key key_len ref rows filtered Extra +1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where +Warnings: +Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where `test`.`t1`.`c1` = 'ä' and `test`.`t1`.`c1` like 'ae' +SELECT * FROM t1 WHERE CONCAT(c1)='ä'; +c1 +ä +SELECT * FROM t1 WHERE CONCAT(c1) LIKE 'ae'; +c1 +ae +SELECT * FROM t1 WHERE CONCAT(c1)='ä' AND CONCAT(c1) LIKE 'ae'; +c1 +EXPLAIN EXTENDED SELECT * FROM t1 WHERE CONCAT(c1)='ä' AND CONCAT(c1) LIKE 'ae'; +id select_type table type possible_keys key key_len ref rows filtered Extra +1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where +Warnings: +Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where concat(`test`.`t1`.`c1`) = 'ä' and concat(`test`.`t1`.`c1`) like 'ae' +DROP TABLE IF EXISTS t1; +# +# End of 10.0 tests +# diff --git a/mysql-test/main/ctype_utf8mb4_bin.test b/mysql-test/main/ctype_utf8mb4_bin.test new file mode 100644 index 00000000000..e832e72338f --- /dev/null +++ b/mysql-test/main/ctype_utf8mb4_bin.test @@ -0,0 +1,52 @@ +--echo # +--echo # Start of 5.5 tests +--echo # + +SET NAMES utf8mb4 COLLATE utf8mb4_bin; +--source include/ctype_special_chars.inc + +--echo # +--echo # End of 5.5 tests +--echo # + + + +--echo # +--echo # Start of 5.6 tests +--echo # + +--echo # +--echo # WL#3664 WEIGHT_STRING +--echo # + +SET NAMES utf8mb4 COLLATE utf8mb4_bin; +--source include/weight_string.inc +--source include/weight_string_euro.inc +--source include/weight_string_l1.inc + + +--echo # +--echo # End of 5.6 tests +--echo # + + +--echo # +--echo # Start of 10.0 tests +--echo # + +# +# Testing regexp +# +SET NAMES utf8mb4 COLLATE utf8mb4_bin; +--source include/ctype_regex.inc +--source include/ctype_regex_utf8.inc + +# +# MDEV-7149 Constant condition propagation erroneously applied for LIKE +# +--source include/ctype_like_cond_propagation.inc +--source include/ctype_like_cond_propagation_utf8_german.inc + +--echo # +--echo # End of 10.0 tests +--echo # diff --git a/mysql-test/main/ctype_utf8mb4_general_ci.result b/mysql-test/main/ctype_utf8mb4_general_ci.result new file mode 100644 index 00000000000..ad729ab8862 --- /dev/null +++ b/mysql-test/main/ctype_utf8mb4_general_ci.result @@ -0,0 +1,622 @@ +# +# Start of 5.5 tests +# +SET NAMES utf8mb4 COLLATE utf8mb4_general_ci; +SELECT COLLATION('a'); +COLLATION('a') +utf8mb4_general_ci +SELECT 'a' = 'a ' AS c; +c +1 +SELECT 'a\0' = 'a' AS c; +c +0 +SELECT 'a\0' = 'a ' AS c; +c +0 +SELECT 'a\t' = 'a' AS c; +c +0 +SELECT 'a\t' = 'a ' AS c; +c +0 +SELECT 'a' < 'a ' AS c; +c +0 +SELECT 'a\0' < 'a' AS c; +c +1 +SELECT 'a\0' < 'a ' AS c; +c +1 +SELECT 'a\t' < 'a' AS c; +c +1 +SELECT 'a\t' < 'a ' AS c; +c +1 +SELECT 'a' > 'a ' AS c; +c +0 +SELECT 'a\0' > 'a' AS c; +c +0 +SELECT 'a\0' > 'a ' AS c; +c +0 +SELECT 'a\t' > 'a' AS c; +c +0 +SELECT 'a\t' > 'a ' AS c; +c +0 +CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS a LIMIT 0; +EXECUTE IMMEDIATE +REPLACE(REPLACE( +"ALTER TABLE t1 ADD a_readable " + "TEXT CHARACTER SET latin1 COLLATE DEFAULT " + "GENERATED ALWAYS AS " + "(RPAD(QUOTE(REGEXP_REPLACE(t1.a, '(\\\\x{00}|\\\\x{09})', '.')), 10))", +'DEFAULT', collation('a')), +'latin1', charset('a')); +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `a` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, + `a_readable` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci GENERATED ALWAYS AS (rpad(quote(regexp_replace(`a`,'(\\x{00}|\\x{09})','.')),10)) VIRTUAL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci +INSERT INTO t1 (a) VALUES ('a'),('a\0'),('a\t'),('a '); +SELECT hex(a),STRCMP(a,'a'), STRCMP(a,'a ') FROM t1; +hex(a) STRCMP(a,'a') STRCMP(a,'a ') +61 0 0 +6100 -1 -1 +6109 -1 -1 +6120 0 0 +SELECT HEX(a), a_readable FROM t1 ORDER BY a, BINARY a; +HEX(a) a_readable +6100 'a.' +6109 'a.' +61 'a' +6120 'a ' +SELECT +HEX(t1.a) AS t1a, +CASE STRCMP(t1.a, t2.a) WHEN -1 THEN '<' WHEN 1 THEN '>' ELSE '=' END AS cmp, +HEX(t2.a) AS t2a, +t1.a_readable, +t2.a_readable +FROM t1 t1, t1 t2 +ORDER BY BINARY t1.a, BINARY t2.a; +t1a cmp t2a a_readable a_readable +61 = 61 'a' 'a' +61 > 6100 'a' 'a.' +61 > 6109 'a' 'a.' +61 = 6120 'a' 'a ' +6100 < 61 'a.' 'a' +6100 = 6100 'a.' 'a.' +6100 < 6109 'a.' 'a.' +6100 < 6120 'a.' 'a ' +6109 < 61 'a.' 'a' +6109 > 6100 'a.' 'a.' +6109 = 6109 'a.' 'a.' +6109 < 6120 'a.' 'a ' +6120 = 61 'a ' 'a' +6120 > 6100 'a ' 'a.' +6120 > 6109 'a ' 'a.' +6120 = 6120 'a ' 'a ' +DROP TABLE t1; +# +# End of 5.5 tests +# +# +# Start of 5.6 tests +# +# +# WL#3664 WEIGHT_STRING +# +SET NAMES utf8mb4 COLLATE utf8mb4_general_ci; +select @@collation_connection; +@@collation_connection +utf8mb4_general_ci +CREATE TABLE t1 AS SELECT 'a' AS a; +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `a` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci +CREATE TABLE t2 AS SELECT WEIGHT_STRING(a) AS ws FROM t1; +SHOW CREATE TABLE t2; +Table Create Table +t2 CREATE TABLE `t2` ( + `ws` varbinary(2) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci +SELECT HEX(WEIGHT_STRING(a)) FROM t1; +HEX(WEIGHT_STRING(a)) +0041 +SELECT HEX(ws) FROM t2; +HEX(ws) +0041 +DROP TABLE t2; +DROP TABLE t1; +CREATE TABLE t1 AS SELECT REPEAT('a',5) AS a; +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `a` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci +CREATE TABLE t2 AS SELECT WEIGHT_STRING(a) AS ws FROM t1; +SHOW CREATE TABLE t2; +Table Create Table +t2 CREATE TABLE `t2` ( + `ws` varbinary(10) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci +SELECT HEX(WEIGHT_STRING(a)) FROM t1; +HEX(WEIGHT_STRING(a)) +00410041004100410041 +SELECT HEX(ws) FROM t2; +HEX(ws) +00410041004100410041 +DROP TABLE t2; +CREATE TABLE t2 AS SELECT WEIGHT_STRING(a AS CHAR(3)) AS ws FROM t1; +SHOW CREATE TABLE t2; +Table Create Table +t2 CREATE TABLE `t2` ( + `ws` varbinary(6) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci +SELECT HEX(WEIGHT_STRING(a AS CHAR(3))) FROM t1; +HEX(WEIGHT_STRING(a AS CHAR(3))) +004100410041 +SELECT HEX(ws) FROM t2; +HEX(ws) +004100410041 +DROP TABLE t2; +CREATE TABLE t2 AS SELECT WEIGHT_STRING(a AS CHAR(10)) AS ws FROM t1; +SHOW CREATE TABLE t2; +Table Create Table +t2 CREATE TABLE `t2` ( + `ws` varbinary(20) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci +SELECT HEX(WEIGHT_STRING(a AS CHAR(10))) FROM t1; +HEX(WEIGHT_STRING(a AS CHAR(10))) +0041004100410041004100200020002000200020 +SELECT HEX(ws) FROM t2; +HEX(ws) +0041004100410041004100200020002000200020 +DROP TABLE t2; +DROP TABLE t1; +select hex(weight_string('a')); +hex(weight_string('a')) +0041 +select hex(weight_string('A')); +hex(weight_string('A')) +0041 +select hex(weight_string('abc')); +hex(weight_string('abc')) +004100420043 +select hex(weight_string('abc' as char(2))); +hex(weight_string('abc' as char(2))) +00410042 +select hex(weight_string('abc' as char(3))); +hex(weight_string('abc' as char(3))) +004100420043 +select hex(weight_string('abc' as char(5))); +hex(weight_string('abc' as char(5))) +00410042004300200020 +select hex(weight_string('abc', 1, 2, 0xC0)); +hex(weight_string('abc', 1, 2, 0xC0)) +00 +select hex(weight_string('abc', 2, 2, 0xC0)); +hex(weight_string('abc', 2, 2, 0xC0)) +0041 +select hex(weight_string('abc', 3, 2, 0xC0)); +hex(weight_string('abc', 3, 2, 0xC0)) +004100 +select hex(weight_string('abc', 4, 2, 0xC0)); +hex(weight_string('abc', 4, 2, 0xC0)) +00410042 +select hex(weight_string('abc', 5, 2, 0xC0)); +hex(weight_string('abc', 5, 2, 0xC0)) +0041004200 +select hex(weight_string('abc',25, 2, 0xC0)); +hex(weight_string('abc',25, 2, 0xC0)) +00410042002000200020002000200020002000200020002000 +select hex(weight_string('abc', 1, 3, 0xC0)); +hex(weight_string('abc', 1, 3, 0xC0)) +00 +select hex(weight_string('abc', 2, 3, 0xC0)); +hex(weight_string('abc', 2, 3, 0xC0)) +0041 +select hex(weight_string('abc', 3, 3, 0xC0)); +hex(weight_string('abc', 3, 3, 0xC0)) +004100 +select hex(weight_string('abc', 4, 3, 0xC0)); +hex(weight_string('abc', 4, 3, 0xC0)) +00410042 +select hex(weight_string('abc', 5, 3, 0xC0)); +hex(weight_string('abc', 5, 3, 0xC0)) +0041004200 +select hex(weight_string('abc',25, 3, 0xC0)); +hex(weight_string('abc',25, 3, 0xC0)) +00410042004300200020002000200020002000200020002000 +select hex(weight_string('abc', 1, 4, 0xC0)); +hex(weight_string('abc', 1, 4, 0xC0)) +00 +select hex(weight_string('abc', 2, 4, 0xC0)); +hex(weight_string('abc', 2, 4, 0xC0)) +0041 +select hex(weight_string('abc', 3, 4, 0xC0)); +hex(weight_string('abc', 3, 4, 0xC0)) +004100 +select hex(weight_string('abc', 4, 4, 0xC0)); +hex(weight_string('abc', 4, 4, 0xC0)) +00410042 +select hex(weight_string('abc', 5, 4, 0xC0)); +hex(weight_string('abc', 5, 4, 0xC0)) +0041004200 +select hex(weight_string('abc',25, 4, 0xC0)); +hex(weight_string('abc',25, 4, 0xC0)) +00410042004300200020002000200020002000200020002000 +select @@collation_connection; +@@collation_connection +utf8mb4_general_ci +select hex(weight_string(cast(_latin1 0x80 as char))); +hex(weight_string(cast(_latin1 0x80 as char))) +20AC +select hex(weight_string(cast(_latin1 0x808080 as char))); +hex(weight_string(cast(_latin1 0x808080 as char))) +20AC20AC20AC +select hex(weight_string(cast(_latin1 0x808080 as char) as char(2))); +hex(weight_string(cast(_latin1 0x808080 as char) as char(2))) +20AC20AC +select hex(weight_string(cast(_latin1 0x808080 as char) as char(3))); +hex(weight_string(cast(_latin1 0x808080 as char) as char(3))) +20AC20AC20AC +select hex(weight_string(cast(_latin1 0x808080 as char) as char(5))); +hex(weight_string(cast(_latin1 0x808080 as char) as char(5))) +20AC20AC20AC00200020 +select hex(weight_string(cast(_latin1 0x808080 as char), 1, 2, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char), 1, 2, 0xC0)) +20 +select hex(weight_string(cast(_latin1 0x808080 as char), 2, 2, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char), 2, 2, 0xC0)) +20AC +select hex(weight_string(cast(_latin1 0x808080 as char), 3, 2, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char), 3, 2, 0xC0)) +20AC20 +select hex(weight_string(cast(_latin1 0x808080 as char), 4, 2, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char), 4, 2, 0xC0)) +20AC20AC +select hex(weight_string(cast(_latin1 0x808080 as char), 5, 2, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char), 5, 2, 0xC0)) +20AC20AC00 +select hex(weight_string(cast(_latin1 0x808080 as char),25, 2, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char),25, 2, 0xC0)) +20AC20AC002000200020002000200020002000200020002000 +select hex(weight_string(cast(_latin1 0x808080 as char), 1, 3, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char), 1, 3, 0xC0)) +20 +select hex(weight_string(cast(_latin1 0x808080 as char), 2, 3, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char), 2, 3, 0xC0)) +20AC +select hex(weight_string(cast(_latin1 0x808080 as char), 3, 3, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char), 3, 3, 0xC0)) +20AC20 +select hex(weight_string(cast(_latin1 0x808080 as char), 4, 3, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char), 4, 3, 0xC0)) +20AC20AC +select hex(weight_string(cast(_latin1 0x808080 as char), 5, 3, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char), 5, 3, 0xC0)) +20AC20AC20 +select hex(weight_string(cast(_latin1 0x808080 as char),25, 3, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char),25, 3, 0xC0)) +20AC20AC20AC00200020002000200020002000200020002000 +select hex(weight_string(cast(_latin1 0x808080 as char), 1, 4, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char), 1, 4, 0xC0)) +20 +select hex(weight_string(cast(_latin1 0x808080 as char), 2, 4, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char), 2, 4, 0xC0)) +20AC +select hex(weight_string(cast(_latin1 0x808080 as char), 3, 4, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char), 3, 4, 0xC0)) +20AC20 +select hex(weight_string(cast(_latin1 0x808080 as char), 4, 4, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char), 4, 4, 0xC0)) +20AC20AC +select hex(weight_string(cast(_latin1 0x808080 as char), 5, 4, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char), 5, 4, 0xC0)) +20AC20AC20 +select hex(weight_string(cast(_latin1 0x808080 as char),25, 4, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char),25, 4, 0xC0)) +20AC20AC20AC00200020002000200020002000200020002000 +select @@collation_connection; +@@collation_connection +utf8mb4_general_ci +select hex(weight_string('a' LEVEL 1)); +hex(weight_string('a' LEVEL 1)) +0041 +select hex(weight_string('A' LEVEL 1)); +hex(weight_string('A' LEVEL 1)) +0041 +select hex(weight_string('abc' LEVEL 1)); +hex(weight_string('abc' LEVEL 1)) +004100420043 +select hex(weight_string('abc' as char(2) LEVEL 1)); +hex(weight_string('abc' as char(2) LEVEL 1)) +00410042 +select hex(weight_string('abc' as char(3) LEVEL 1)); +hex(weight_string('abc' as char(3) LEVEL 1)) +004100420043 +select hex(weight_string('abc' as char(5) LEVEL 1)); +hex(weight_string('abc' as char(5) LEVEL 1)) +00410042004300200020 +select hex(weight_string('abc' as char(5) LEVEL 1 REVERSE)); +hex(weight_string('abc' as char(5) LEVEL 1 REVERSE)) +20002000430042004100 +select hex(weight_string('abc' as char(5) LEVEL 1 DESC)); +hex(weight_string('abc' as char(5) LEVEL 1 DESC)) +FFBEFFBDFFBCFFDFFFDF +select hex(weight_string('abc' as char(5) LEVEL 1 DESC REVERSE)); +hex(weight_string('abc' as char(5) LEVEL 1 DESC REVERSE)) +DFFFDFFFBCFFBDFFBEFF +# +# End of 5.6 tests +# +# +# Start of 10.0 tests +# +SET NAMES utf8mb4 COLLATE utf8mb4_general_ci; +# +# Bug#31081 server crash in regexp function +# +drop table if exists t1; +create table t1 as +select repeat(' ', 64) as s1, repeat(' ',64) as s2 +union +select null, null; +show create table t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `s1` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, + `s2` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci +delete from t1; +insert into t1 values('aaa','aaa'); +insert into t1 values('aaa|qqq','qqq'); +insert into t1 values('gheis','^[^a-dXYZ]+$'); +insert into t1 values('aab','^aa?b'); +insert into t1 values('Baaan','^Ba*n'); +insert into t1 values('aaa','qqq|aaa'); +insert into t1 values('qqq','qqq|aaa'); +insert into t1 values('bbb','qqq|aaa'); +insert into t1 values('bbb','qqq'); +insert into t1 values('aaa','aba'); +insert into t1 values(null,'abc'); +insert into t1 values('def',null); +insert into t1 values(null,null); +insert into t1 values('ghi','ghi['); +select HIGH_PRIORITY s1 regexp s2 from t1; +s1 regexp s2 +0 +0 +0 +1 +1 +1 +1 +1 +1 +1 +NULL +NULL +NULL +NULL +drop table t1; +# +# Bug #3928 regexp [[:>:]] and UTF-8 +# +SELECT @@character_set_client, @@collation_connection; +@@character_set_client @@collation_connection +utf8mb4 utf8mb4_general_ci +# This should return TRUE +select 'вася' rlike '\\bвася\\b'; +'вася' rlike '\\bвася\\b' +1 +select 'вася ' rlike '\\bвася\\b'; +'вася ' rlike '\\bвася\\b' +1 +select ' вася' rlike '\\bвася\\b'; +' вася' rlike '\\bвася\\b' +1 +select ' вася ' rlike '\\bвася\\b'; +' вася ' rlike '\\bвася\\b' +1 +select 'вася' rlike '[[:<:]]вася[[:>:]]'; +'вася' rlike '[[:<:]]вася[[:>:]]' +1 +select 'вася ' rlike '[[:<:]]вася[[:>:]]'; +'вася ' rlike '[[:<:]]вася[[:>:]]' +1 +select ' вася' rlike '[[:<:]]вася[[:>:]]'; +' вася' rlike '[[:<:]]вася[[:>:]]' +1 +select ' вася ' rlike '[[:<:]]вася[[:>:]]'; +' вася ' rlike '[[:<:]]вася[[:>:]]' +1 +# This should return FALSE +select 'васяz' rlike '\\bвася\\b'; +'васяz' rlike '\\bвася\\b' +0 +select 'zвася' rlike '\\bвася\\b'; +'zвася' rlike '\\bвася\\b' +0 +select 'zвасяz' rlike '\\bвася\\b'; +'zвасяz' rlike '\\bвася\\b' +0 +select 'васяz' rlike '[[:<:]]вася[[:>:]]'; +'васяz' rlike '[[:<:]]вася[[:>:]]' +0 +select 'zвася' rlike '[[:<:]]вася[[:>:]]'; +'zвася' rlike '[[:<:]]вася[[:>:]]' +0 +select 'zвасяz' rlike '[[:<:]]вася[[:>:]]'; +'zвасяz' rlike '[[:<:]]вася[[:>:]]' +0 +# +# MDEV-7149 Constant condition propagation erroneously applied for LIKE +# +CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS c1 LIMIT 0; +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `c1` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci +INSERT INTO t1 VALUES ('a'),('a '); +SELECT * FROM t1 WHERE CONCAT(c1)='a'; +c1 +a +a +SELECT * FROM t1 WHERE CONCAT(c1) LIKE 'a '; +c1 +a +SELECT * FROM t1 WHERE CONCAT(c1)='a' AND CONCAT(c1) LIKE 'a '; +c1 +a +EXPLAIN EXTENDED SELECT * FROM t1 WHERE CONCAT(c1)='a' AND CONCAT(c1) LIKE 'a '; +id select_type table type possible_keys key key_len ref rows filtered Extra +1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where +Warnings: +Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where concat(`test`.`t1`.`c1`) = 'a' and concat(`test`.`t1`.`c1`) like 'a ' +DROP TABLE t1; +CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS c1 LIMIT 0; +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `c1` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci +INSERT INTO t1 VALUES ('a'),('a '); +SELECT * FROM t1 WHERE 'a'=CONCAT(c1); +c1 +a +a +SELECT * FROM t1 WHERE 'a ' LIKE CONCAT(c1); +c1 +a +SELECT * FROM t1 WHERE 'a'=CONCAT(c1) AND 'a ' LIKE CONCAT(c1); +c1 +a +EXPLAIN EXTENDED SELECT * FROM t1 WHERE 'a'=CONCAT(c1) AND 'a ' LIKE CONCAT(c1); +id select_type table type possible_keys key key_len ref rows filtered Extra +1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where +Warnings: +Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where 'a' = concat(`test`.`t1`.`c1`) and 'a ' like concat(`test`.`t1`.`c1`) +DROP TABLE t1; +CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS c1 LIMIT 0; +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `c1` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci +INSERT INTO t1 VALUES ('%'),('% '); +SELECT * FROM t1 WHERE '% '=CONCAT(c1); +c1 +% +% +SELECT * FROM t1 WHERE 'a' LIKE CONCAT(c1); +c1 +% +SELECT * FROM t1 WHERE '% '=CONCAT(c1) AND 'a' LIKE CONCAT(c1); +c1 +% +EXPLAIN EXTENDED SELECT * FROM t1 WHERE '% '=CONCAT(c1) AND 'a' LIKE CONCAT(c1); +id select_type table type possible_keys key key_len ref rows filtered Extra +1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where +Warnings: +Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where '% ' = concat(`test`.`t1`.`c1`) and 'a' like concat(`test`.`t1`.`c1`) +DROP TABLE t1; +CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS c1 LIMIT 0; +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `c1` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci +INSERT INTO t1 VALUES ('%'),('% '); +SELECT * FROM t1 WHERE '%'=CONCAT(c1); +c1 +% +% +SELECT * FROM t1 WHERE 'a' LIKE CONCAT(c1); +c1 +% +SELECT * FROM t1 WHERE '%'=CONCAT(c1) AND 'a' LIKE CONCAT(c1); +c1 +% +EXPLAIN EXTENDED SELECT * FROM t1 WHERE '%'=CONCAT(c1) AND 'a' LIKE CONCAT(c1); +id select_type table type possible_keys key key_len ref rows filtered Extra +1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where +Warnings: +Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where '%' = concat(`test`.`t1`.`c1`) and 'a' like concat(`test`.`t1`.`c1`) +DROP TABLE t1; +# +# MDEV-8694 Wrong result for SELECT..WHERE a NOT LIKE 'a ' AND a='a' +# +CREATE TABLE t1 AS SELECT SPACE(10) AS a LIMIT 0; +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `a` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci +INSERT INTO t1 VALUES ('a'),('a '); +SELECT a, LENGTH(a) FROM t1 WHERE a NOT LIKE 'a '; +a LENGTH(a) +a 1 +SELECT a, LENGTH(a) FROM t1 WHERE a NOT LIKE 'a ' AND a='a'; +a LENGTH(a) +a 1 +EXPLAIN EXTENDED SELECT a, LENGTH(a) FROM t1 WHERE a NOT LIKE 'a ' AND a='a'; +id select_type table type possible_keys key key_len ref rows filtered Extra +1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where +Warnings: +Note 1003 select `test`.`t1`.`a` AS `a`,octet_length(`test`.`t1`.`a`) AS `LENGTH(a)` from `test`.`t1` where `test`.`t1`.`a` not like 'a ' and `test`.`t1`.`a` = 'a' +DROP TABLE t1; +# +# End of MDEV-8694 +# +# +# MDEV-7149 Constant condition propagation erroneously applied for LIKE +# +CREATE TABLE t1 AS SELECT REPEAT('a',10) AS c1 LIMIT 0; +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `c1` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci +INSERT INTO t1 VALUES ('ae'),('ä'); +SELECT * FROM t1 WHERE c1='ä'; +c1 +ä +SELECT * FROM t1 WHERE c1 LIKE 'ae'; +c1 +ae +SELECT * FROM t1 WHERE c1='ä' AND c1 LIKE 'ae'; +c1 +EXPLAIN EXTENDED SELECT * FROM t1 WHERE c1='ä' AND c1 LIKE 'ae'; +id select_type table type possible_keys key key_len ref rows filtered Extra +1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where +Warnings: +Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where `test`.`t1`.`c1` = 'ä' and `test`.`t1`.`c1` like 'ae' +SELECT * FROM t1 WHERE CONCAT(c1)='ä'; +c1 +ä +SELECT * FROM t1 WHERE CONCAT(c1) LIKE 'ae'; +c1 +ae +SELECT * FROM t1 WHERE CONCAT(c1)='ä' AND CONCAT(c1) LIKE 'ae'; +c1 +EXPLAIN EXTENDED SELECT * FROM t1 WHERE CONCAT(c1)='ä' AND CONCAT(c1) LIKE 'ae'; +id select_type table type possible_keys key key_len ref rows filtered Extra +1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where +Warnings: +Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where concat(`test`.`t1`.`c1`) = 'ä' and concat(`test`.`t1`.`c1`) like 'ae' +DROP TABLE IF EXISTS t1; +# +# End of 10.0 tests +# diff --git a/mysql-test/main/ctype_utf8mb4_general_ci.test b/mysql-test/main/ctype_utf8mb4_general_ci.test new file mode 100644 index 00000000000..13c00deb1d8 --- /dev/null +++ b/mysql-test/main/ctype_utf8mb4_general_ci.test @@ -0,0 +1,52 @@ +--echo # +--echo # Start of 5.5 tests +--echo # + +SET NAMES utf8mb4 COLLATE utf8mb4_general_ci; +--source include/ctype_special_chars.inc + +--echo # +--echo # End of 5.5 tests +--echo # + + + +--echo # +--echo # Start of 5.6 tests +--echo # + +--echo # +--echo # WL#3664 WEIGHT_STRING +--echo # + +SET NAMES utf8mb4 COLLATE utf8mb4_general_ci; +--source include/weight_string.inc +--source include/weight_string_euro.inc +--source include/weight_string_l1.inc + + +--echo # +--echo # End of 5.6 tests +--echo # + + +--echo # +--echo # Start of 10.0 tests +--echo # + +# +# Testing regexp +# +SET NAMES utf8mb4 COLLATE utf8mb4_general_ci; +--source include/ctype_regex.inc +--source include/ctype_regex_utf8.inc + +# +# MDEV-7149 Constant condition propagation erroneously applied for LIKE +# +--source include/ctype_like_cond_propagation.inc +--source include/ctype_like_cond_propagation_utf8_german.inc + +--echo # +--echo # End of 10.0 tests +--echo # diff --git a/mysql-test/main/ctype_utf8mb4_heap.result b/mysql-test/main/ctype_utf8mb4_heap.result index 91647451458..b8794a85b1d 100644 --- a/mysql-test/main/ctype_utf8mb4_heap.result +++ b/mysql-test/main/ctype_utf8mb4_heap.result @@ -75,20 +75,20 @@ CONVERT(_koi8r'\xD7\xC1\xD3\xD1' USING utf8mb4) LIKE CONVERT(_koi8r'\xF7\xE1\xF3 select CONVERT(_koi8r'' USING utf8mb4) LIKE CONVERT(_koi8r'' USING utf8mb4); CONVERT(_koi8r'\xF7\xE1\xF3\xF1' USING utf8mb4) LIKE CONVERT(_koi8r'\xD7\xC1\xD3\xD1' USING utf8mb4) 1 -SELECT 'a' = 'a '; -'a' = 'a ' +SELECT 'a' = 'a ' collate utf8mb4_general_ci; +'a' = 'a ' collate utf8mb4_general_ci 1 -SELECT 'a\0' < 'a'; -'a\0' < 'a' +SELECT 'a\0' < 'a' collate utf8mb4_general_ci; +'a\0' < 'a' collate utf8mb4_general_ci 1 -SELECT 'a\0' < 'a '; -'a\0' < 'a ' +SELECT 'a\0' < 'a ' collate utf8mb4_general_ci; +'a\0' < 'a ' collate utf8mb4_general_ci 1 -SELECT 'a\t' < 'a'; -'a\t' < 'a' +SELECT 'a\t' < 'a' collate utf8mb4_general_ci; +'a\t' < 'a' collate utf8mb4_general_ci 1 -SELECT 'a\t' < 'a '; -'a\t' < 'a ' +SELECT 'a\t' < 'a ' collate utf8mb4_general_ci; +'a\t' < 'a ' collate utf8mb4_general_ci 1 SELECT 'a' = 'a ' collate utf8mb4_bin; 'a' = 'a ' collate utf8mb4_bin @@ -105,7 +105,7 @@ SELECT 'a\t' < 'a' collate utf8mb4_bin; SELECT 'a\t' < 'a ' collate utf8mb4_bin; 'a\t' < 'a ' collate utf8mb4_bin 1 -CREATE TABLE t1 (a char(10) character set utf8mb4 not null) ENGINE heap; +CREATE TABLE t1 (a char(10) character set utf8mb4 collate utf8mb4_general_ci not null) ENGINE heap; INSERT INTO t1 VALUES ('a'),('a\0'),('a\t'),('a '); SELECT hex(a),STRCMP(a,'a'), STRCMP(a,'a ') FROM t1; hex(a) STRCMP(a,'a') STRCMP(a,'a ') @@ -127,7 +127,7 @@ create table t1 ENGINE heap select date_format("2004-01-19 10:10:10", "%Y-%m-%d" show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `date_format("2004-01-19 10:10:10", "%Y-%m-%d")` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL + `date_format("2004-01-19 10:10:10", "%Y-%m-%d")` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_uca1400_ai_ci DEFAULT NULL ) ENGINE=MEMORY DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci select * from t1; date_format("2004-01-19 10:10:10", "%Y-%m-%d") @@ -261,6 +261,9 @@ select * from t1 where a = 'b' and a != 'b'; a drop table t1; set names utf8mb4; +# +# Bug#31081 server crash in regexp function +# drop table if exists t1; create table t1 as select repeat(' ', 64) as s1, repeat(' ',64) as s2 @@ -269,8 +272,8 @@ select null, null; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `s1` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, - `s2` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL + `s1` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_uca1400_ai_ci DEFAULT NULL, + `s2` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_uca1400_ai_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci delete from t1; insert into t1 values('aaa','aaa'); @@ -304,9 +307,13 @@ NULL NULL NULL drop table t1; +# +# Bug #3928 regexp [[:>:]] and UTF-8 +# SELECT @@character_set_client, @@collation_connection; @@character_set_client @@collation_connection -utf8mb4 utf8mb4_general_ci +utf8mb4 utf8mb4_uca1400_ai_ci +# This should return TRUE select 'вася' rlike '\\bвася\\b'; 'вася' rlike '\\bвася\\b' 1 @@ -331,6 +338,7 @@ select ' вася' rlike '[[:<:]]вася[[:>:]]'; select ' вася ' rlike '[[:<:]]вася[[:>:]]'; ' вася ' rlike '[[:<:]]вася[[:>:]]' 1 +# This should return FALSE select 'васяz' rlike '\\bвася\\b'; 'васяz' rlike '\\bвася\\b' 0 @@ -357,7 +365,7 @@ create table t1 (a enum('aaaa','проба') character set utf8mb4) engine heap; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` enum('aaaa','проба') CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL + `a` enum('aaaa','проба') CHARACTER SET utf8mb4 COLLATE utf8mb4_uca1400_ai_ci DEFAULT NULL ) ENGINE=MEMORY DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci insert into t1 values ('проба'); select * from t1; @@ -367,7 +375,7 @@ create table t2 engine heap select ifnull(a,a) from t1; show create table t2; Table Create Table t2 CREATE TABLE `t2` ( - `ifnull(a,a)` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL + `ifnull(a,a)` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_uca1400_ai_ci DEFAULT NULL ) ENGINE=MEMORY DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci select * from t2; ifnull(a,a) @@ -493,7 +501,7 @@ unique key a using hash (c(1)) show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `c` char(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, + `c` char(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_uca1400_ai_ci DEFAULT NULL, UNIQUE KEY `a` (`c`(1)) USING HASH ) ENGINE=MEMORY DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci insert into t1 values ('a'),('b'),('c'),('d'),('e'),('f'); @@ -529,7 +537,7 @@ unique key a using btree (c(1)) show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `c` char(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, + `c` char(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_uca1400_ai_ci DEFAULT NULL, UNIQUE KEY `a` (`c`(1)) USING BTREE ) ENGINE=MEMORY DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci insert into t1 values ('a'),('b'),('c'),('d'),('e'),('f'); @@ -840,8 +848,8 @@ create table t2 engine heap select concat(a,_utf8mb4'') as a, concat(b,_utf8mb4' show create table t2; Table Create Table t2 CREATE TABLE `t2` ( - `a` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, - `b` varchar(15) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL + `a` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_uca1400_ai_ci DEFAULT NULL, + `b` varchar(15) CHARACTER SET utf8mb4 COLLATE utf8mb4_uca1400_ai_ci DEFAULT NULL ) ENGINE=MEMORY DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop table t2; drop table t1; @@ -1397,7 +1405,7 @@ char(a) 1 2 drop table t1; -CREATE TABLE t1 (item varchar(255)) default character set utf8mb4 ENGINE heap; +CREATE TABLE t1 (item varchar(255)) default character set utf8mb4 collate utf8mb4_general_ci ENGINE heap; INSERT INTO t1 VALUES (N'\\'); INSERT INTO t1 VALUES (_utf8mb4'\\'); INSERT INTO t1 VALUES (N'Cote d\'Ivoire'); @@ -1676,7 +1684,7 @@ SET CHARACTER SET utf8mb4; SHOW VARIABLES LIKE 'character\_set\_%'; Variable_name Value character_set_client utf8mb4 -character_set_collations +character_set_collations utf8mb3=utf8mb3_uca1400_ai_ci,ucs2=ucs2_uca1400_ai_ci,utf8mb4=utf8mb4_uca1400_ai_ci,utf16=utf16_uca1400_ai_ci,utf32=utf32_uca1400_ai_ci character_set_connection latin1 character_set_database latin1 character_set_filesystem binary @@ -1686,18 +1694,18 @@ character_set_system utf8mb3 SET @@character_set_server=@save_character_set_server; CREATE DATABASE crashtest DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin; USE crashtest; -CREATE TABLE crashtest (crash char(10)) DEFAULT CHARSET=utf8mb4 ENGINE heap; +CREATE TABLE crashtest (crash char(10)) DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_general_ci ENGINE heap; INSERT INTO crashtest VALUES ('35'), ('36'), ('37'); -SELECT * FROM crashtest ORDER BY CHAR(crash USING utf8mb4); +SELECT * FROM crashtest ORDER BY CHAR(crash USING utf8mb4) COLLATE utf8mb4_general_ci; crash 35 36 37 INSERT INTO crashtest VALUES ('-1000'); -EXPLAIN SELECT * FROM crashtest ORDER BY CHAR(crash USING utf8mb4); +EXPLAIN SELECT * FROM crashtest ORDER BY CHAR(crash USING utf8mb4) COLLATE utf8mb4_general_ci; id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE crashtest ALL NULL NULL NULL NULL 4 Using filesort -SELECT * FROM crashtest ORDER BY CHAR(crash USING utf8mb4); +SELECT * FROM crashtest ORDER BY CHAR(crash USING utf8mb4) COLLATE utf8mb4_general_ci; crash -1000 35 @@ -1874,7 +1882,7 @@ insert into t1 values('t1_val'); create view v1 as select 'v1_val' as col1; select coercibility(col1), collation(col1) from v1; coercibility(col1) collation(col1) -5 utf8mb4_general_ci +5 utf8mb4_uca1400_ai_ci create view v2 as select col1 from v1 union select col1 from t1; select coercibility(col1), collation(col1)from v2; coercibility(col1) collation(col1) @@ -1908,7 +1916,7 @@ select concat(a, if(b>10, _utf8mb4'x', _utf8mb4'y')) from t1; concat(a, if(b>10, _utf8mb4'x', _utf8mb4'y')) ay select concat(a, if(b>10, _utf8mb4'æ', _utf8mb4'ß')) from t1; -ERROR HY000: Illegal mix of collations (latin1_swedish_ci,IMPLICIT) and (utf8mb4_general_ci,COERCIBLE) for operation 'concat' +ERROR HY000: Illegal mix of collations (latin1_swedish_ci,IMPLICIT) and (utf8mb4_uca1400_ai_ci,COERCIBLE) for operation 'concat' drop table t1; set names utf8mb4; create table t1 (a varchar(10) character set latin1, b int) engine heap; @@ -1917,7 +1925,7 @@ select concat(a, if(b>10, _utf8mb4 0x78, _utf8mb4 0x79)) from t1; concat(a, if(b>10, _utf8mb4 0x78, _utf8mb4 0x79)) ay select concat(a, if(b>10, _utf8mb4 0xC3A6, _utf8mb4 0xC3AF)) from t1; -ERROR HY000: Illegal mix of collations (latin1_swedish_ci,IMPLICIT) and (utf8mb4_general_ci,COERCIBLE) for operation 'concat' +ERROR HY000: Illegal mix of collations (latin1_swedish_ci,IMPLICIT) and (utf8mb4_uca1400_ai_ci,COERCIBLE) for operation 'concat' drop table t1; set names utf8mb4; create table t1 (a varchar(10) character set latin1, b int) engine heap; @@ -1926,7 +1934,7 @@ select concat(a, if(b>10, 'x' 'x', 'y' 'y')) from t1; concat(a, if(b>10, 'x' 'x', 'y' 'y')) ayy select concat(a, if(b>10, 'x' 'æ', 'y' 'ß')) from t1; -ERROR HY000: Illegal mix of collations (latin1_swedish_ci,IMPLICIT) and (utf8mb4_general_ci,COERCIBLE) for operation 'concat' +ERROR HY000: Illegal mix of collations (latin1_swedish_ci,IMPLICIT) and (utf8mb4_uca1400_ai_ci,COERCIBLE) for operation 'concat' drop table t1; CREATE TABLE t1 ( colA int(11) NOT NULL, @@ -2059,7 +2067,7 @@ DROP TABLE IF EXISTS t1; CREATE TABLE t1 ( predicted_order int NOT NULL, utf8mb4_encoding VARCHAR(10) NOT NULL -) CHARACTER SET utf8mb4 ENGINE heap; +) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci ENGINE heap; INSERT INTO t1 VALUES (19, x'E0B696'), (30, x'E0B69AE0B798'), (61, x'E0B6AF'), (93, x'E0B799'), (52, x'E0B6A6'), (73, x'E0B6BBE0B78AE2808D'), (3, x'E0B686'), (56, x'E0B6AA'), (55, x'E0B6A9'), (70, x'E0B6B9'), (94, x'E0B79A'), (80, x'E0B785'), (25, x'E0B69AE0B791'), (48, x'E0B6A2'), (13, x'E0B690'), (86, x'E0B793'), (91, x'E0B79F'), (81, x'E0B786'), (79, x'E0B784'), (14, x'E0B691'), (99, x'E0B78A'), (8, x'E0B68B'), (68, x'E0B6B7'), (22, x'E0B69A'), (16, x'E0B693'), (33, x'E0B69AE0B7B3'), (38, x'E0B69AE0B79D'), (21, x'E0B683'), (11, x'E0B68E'), (77, x'E0B782'), (40, x'E0B69AE0B78A'), (101, x'E0B78AE2808DE0B6BB'), (35, x'E0B69AE0B79A'), (1, x'E0B7B4'), (9, x'E0B68C'), (96, x'E0B79C'), (6, x'E0B689'), (95, x'E0B79B'), (88, x'E0B796'), (64, x'E0B6B3'), (26, x'E0B69AE0B792'), (82, x'E0B78F'), (28, x'E0B69AE0B794'), (39, x'E0B69AE0B79E'), (97, x'E0B79D'), (2, x'E0B685'), (75, x'E0B780'), (34, x'E0B69AE0B799'), (69, x'E0B6B8'), (83, x'E0B790'), (18, x'E0B695'), (90, x'E0B7B2'), (17, x'E0B694'), (72, x'E0B6BB'), (66, x'E0B6B5'), (59, x'E0B6AD'), (44, x'E0B69E'), (15, x'E0B692'), (23, x'E0B69AE0B78F'), (65, x'E0B6B4'), (42, x'E0B69C'), (63, x'E0B6B1'), (85, x'E0B792'), (47, x'E0B6A1'), (49, x'E0B6A3'), (92, x'E0B7B3'), (78, x'E0B783'), (36, x'E0B69AE0B79B'), (4, x'E0B687'), (24, x'E0B69AE0B790'), (87, x'E0B794'), (37, x'E0B69AE0B79C'), (32, x'E0B69AE0B79F'), (29, x'E0B69AE0B796'), (43, x'E0B69D'), (62, x'E0B6B0'), (100, x'E0B78AE2808DE0B6BA'), (60, x'E0B6AE'), (45, x'E0B69F'), (12, x'E0B68F'), (46, x'E0B6A0'), (50, x'E0B6A5'), (51, x'E0B6A4'), (5, x'E0B688'), (76, x'E0B781'), (89, x'E0B798'), (74, x'E0B6BD'), (10, x'E0B68D'), (57, x'E0B6AB'), (71, x'E0B6BA'), (58, x'E0B6AC'), (27, x'E0B69AE0B793'), (54, x'E0B6A8'), (84, x'E0B791'), (31, x'E0B69AE0B7B2'), (98, x'E0B79E'), (53, x'E0B6A7'), (41, x'E0B69B'), (67, x'E0B6B6'), (7, x'E0B68A'), (20, x'E0B682'); SELECT predicted_order, hex(utf8mb4_encoding) FROM t1 ORDER BY utf8mb4_encoding COLLATE utf8mb4_sinhala_ci; predicted_order hex(utf8mb4_encoding) @@ -2233,7 +2241,7 @@ DROP TABLE IF EXISTS t1; CREATE TABLE t1 ( u_decimal int NOT NULL, utf8mb4_encoding VARCHAR(10) NOT NULL -) CHARACTER SET utf8mb4 ENGINE heap; +) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci ENGINE heap; INSERT INTO t1 VALUES (119040, x'f09d8480'), # G CLEF (119070, x'f09d849e'), @@ -2278,7 +2286,7 @@ DROP TABLE IF EXISTS t2; CREATE TABLE t2 ( u_decimal int NOT NULL, utf8mb3_encoding VARCHAR(10) NOT NULL -) CHARACTER SET utf8mb3 ENGINE heap; +) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci ENGINE heap; INSERT INTO t2 VALUES (42856, x'ea9da8'); INSERT INTO t2 VALUES (65131, x'efb9ab'); INSERT IGNORE INTO t2 VALUES (1114111, x'f48fbfbf'); @@ -2349,7 +2357,7 @@ WHERE t1.utf8mb4_encoding > t2.utf8mb3_encoding; count(*) 33 SET STATEMENT sql_mode = 'NO_ENGINE_SUBSTITUTION' FOR -ALTER TABLE t1 CONVERT TO CHARACTER SET utf8; +ALTER TABLE t1 CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci; SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( @@ -2370,7 +2378,7 @@ u_decimal hex(utf8mb4_encoding) utf8mb4_encoding 120735 3F ? 65131 EFB9AB3F3F3F3F3FEFB9ABEFB9AB3FEFB9AB ﹫?????﹫﹫?﹫ 917999 3F ? -ALTER TABLE t2 CONVERT TO CHARACTER SET utf8mb4; +ALTER TABLE t2 CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( @@ -2382,7 +2390,7 @@ u_decimal hex(utf8mb3_encoding) 1114111 3F3F3F3F 42856 EA9DA8 65131 EFB9AB -ALTER TABLE t2 CONVERT TO CHARACTER SET utf8mb3; +ALTER TABLE t2 CONVERT TO CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci; SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( @@ -2394,7 +2402,7 @@ u_decimal hex(utf8mb3_encoding) 1114111 3F3F3F3F 42856 EA9DA8 65131 EFB9AB -ALTER TABLE t1 MODIFY utf8mb4_encoding VARCHAR(10) CHARACTER SET utf8mb3; +ALTER TABLE t1 MODIFY utf8mb4_encoding VARCHAR(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci; SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( @@ -2415,7 +2423,7 @@ u_decimal hex(utf8mb4_encoding) 120735 3F 65131 EFB9AB3F3F3F3F3FEFB9ABEFB9AB3FEFB9AB 917999 3F -ALTER TABLE t1 MODIFY utf8mb4_encoding VARCHAR(10) CHARACTER SET utf8mb4; +ALTER TABLE t1 MODIFY utf8mb4_encoding VARCHAR(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( @@ -2436,7 +2444,7 @@ u_decimal hex(utf8mb4_encoding) 120735 3F 65131 EFB9AB3F3F3F3F3FEFB9ABEFB9AB3FEFB9AB 917999 3F -ALTER TABLE t2 MODIFY utf8mb3_encoding VARCHAR(10) CHARACTER SET utf8mb4; +ALTER TABLE t2 MODIFY utf8mb3_encoding VARCHAR(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( @@ -2452,13 +2460,13 @@ DROP TABLE IF EXISTS t3; CREATE TABLE t3 ( u_decimal int NOT NULL, utf8mb3_encoding VARCHAR(10) NOT NULL -) CHARACTER SET utf8 ENGINE heap; +) CHARACTER SET utf8 COLLATE utf8_general_ci ENGINE heap; INSERT INTO t3 SELECT * FROM t1; DROP TABLE IF EXISTS t4; CREATE TABLE t4 ( u_decimal int NOT NULL, utf8mb4_encoding VARCHAR(10) NOT NULL -) CHARACTER SET utf8mb4 ENGINE heap; +) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci ENGINE heap; INSERT INTO t3 SELECT * FROM t2; DROP TABLE t1; DROP TABLE t2; @@ -2470,11 +2478,11 @@ DROP TABLE t4; SELECT CHARSET(CONCAT(_utf8mb4'a',_utf8'b')); CHARSET(CONCAT(_utf8mb4'a',_utf8'b')) utf8mb4 -CREATE TABLE t1 (utf8mb4 VARCHAR(10) CHARACTER SET utf8mb4 NOT NULL) ENGINE heap; +CREATE TABLE t1 (utf8mb4 VARCHAR(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL) ENGINE heap; INSERT INTO t1 VALUES (x'ea9da8'),(x'f48fbfbf'); SELECT CONCAT(utf8mb4, _utf8 x'ea9da8') FROM t1 LIMIT 0; CONCAT(utf8mb4, _utf8 x'ea9da8') -CREATE TABLE t2 (utf8mb3 VARCHAR(10) CHARACTER SET utf8mb3 NOT NULL) ENGINE heap; +CREATE TABLE t2 (utf8mb3 VARCHAR(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL) ENGINE heap; INSERT INTO t2 VALUES (x'ea9da8'); SELECT HEX(CONCAT(utf8mb4, utf8mb3)) FROM t1,t2 ORDER BY 1; HEX(CONCAT(utf8mb4, utf8mb3)) @@ -2505,12 +2513,12 @@ DROP TABLE t2; # # Check that mixing utf8mb4 with an invalid utf8 constant returns error # -CREATE TABLE t1 (utf8mb4 VARCHAR(10) CHARACTER SET utf8mb4) ENGINE heap; +CREATE TABLE t1 (utf8mb4 VARCHAR(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci) ENGINE heap; INSERT INTO t1 VALUES (x'f48fbfbf'); SELECT CONCAT(utf8mb4, _utf8 '') FROM t1; -ERROR HY000: Illegal mix of collations (utf8mb4_general_ci,IMPLICIT) and (utf8mb3_general_ci,COERCIBLE) for operation 'concat' +ERROR HY000: Illegal mix of collations (utf8mb4_general_ci,IMPLICIT) and (utf8mb3_uca1400_ai_ci,COERCIBLE) for operation 'concat' SELECT CONCAT('a', _utf8 '') FROM t1; -ERROR HY000: Illegal mix of collations (utf8mb4_general_ci,COERCIBLE) and (utf8mb3_general_ci,COERCIBLE) for operation 'concat' +ERROR HY000: Illegal mix of collations (utf8mb4_uca1400_ai_ci,COERCIBLE) and (utf8mb3_uca1400_ai_ci,COERCIBLE) for operation 'concat' DROP TABLE t1; # # End of 5.5 tests @@ -2523,7 +2531,8 @@ DROP TABLE t1; # CREATE TABLE t1 ( id INT NOT NULL AUTO_INCREMENT PRIMARY KEY, -a VARCHAR(10) CHARACTER SET utf8mb4, KEY(a,id) +a VARCHAR(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci, +KEY(a,id) ); INSERT INTO t1 (a) VALUES (0x61); INSERT INTO t1 (a) VALUES (0xC280),(0xDFBF); diff --git a/mysql-test/main/ctype_utf8mb4_innodb.result b/mysql-test/main/ctype_utf8mb4_innodb.result index f52b87f2cd8..4a3bf6ec6a4 100644 --- a/mysql-test/main/ctype_utf8mb4_innodb.result +++ b/mysql-test/main/ctype_utf8mb4_innodb.result @@ -75,20 +75,20 @@ CONVERT(_koi8r'\xD7\xC1\xD3\xD1' USING utf8mb4) LIKE CONVERT(_koi8r'\xF7\xE1\xF3 select CONVERT(_koi8r'' USING utf8mb4) LIKE CONVERT(_koi8r'' USING utf8mb4); CONVERT(_koi8r'\xF7\xE1\xF3\xF1' USING utf8mb4) LIKE CONVERT(_koi8r'\xD7\xC1\xD3\xD1' USING utf8mb4) 1 -SELECT 'a' = 'a '; -'a' = 'a ' +SELECT 'a' = 'a ' collate utf8mb4_general_ci; +'a' = 'a ' collate utf8mb4_general_ci 1 -SELECT 'a\0' < 'a'; -'a\0' < 'a' +SELECT 'a\0' < 'a' collate utf8mb4_general_ci; +'a\0' < 'a' collate utf8mb4_general_ci 1 -SELECT 'a\0' < 'a '; -'a\0' < 'a ' +SELECT 'a\0' < 'a ' collate utf8mb4_general_ci; +'a\0' < 'a ' collate utf8mb4_general_ci 1 -SELECT 'a\t' < 'a'; -'a\t' < 'a' +SELECT 'a\t' < 'a' collate utf8mb4_general_ci; +'a\t' < 'a' collate utf8mb4_general_ci 1 -SELECT 'a\t' < 'a '; -'a\t' < 'a ' +SELECT 'a\t' < 'a ' collate utf8mb4_general_ci; +'a\t' < 'a ' collate utf8mb4_general_ci 1 SELECT 'a' = 'a ' collate utf8mb4_bin; 'a' = 'a ' collate utf8mb4_bin @@ -105,7 +105,7 @@ SELECT 'a\t' < 'a' collate utf8mb4_bin; SELECT 'a\t' < 'a ' collate utf8mb4_bin; 'a\t' < 'a ' collate utf8mb4_bin 1 -CREATE TABLE t1 (a char(10) character set utf8mb4 not null) ENGINE InnoDB; +CREATE TABLE t1 (a char(10) character set utf8mb4 collate utf8mb4_general_ci not null) ENGINE InnoDB; INSERT INTO t1 VALUES ('a'),('a\0'),('a\t'),('a '); SELECT hex(a),STRCMP(a,'a'), STRCMP(a,'a ') FROM t1; hex(a) STRCMP(a,'a') STRCMP(a,'a ') @@ -127,7 +127,7 @@ create table t1 ENGINE InnoDB select date_format("2004-01-19 10:10:10", "%Y-%m-% show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `date_format("2004-01-19 10:10:10", "%Y-%m-%d")` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL + `date_format("2004-01-19 10:10:10", "%Y-%m-%d")` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_uca1400_ai_ci DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci select * from t1; date_format("2004-01-19 10:10:10", "%Y-%m-%d") @@ -273,6 +273,9 @@ select * from t1 where a = 'b' and a != 'b'; a drop table t1; set names utf8mb4; +# +# Bug#31081 server crash in regexp function +# drop table if exists t1; create table t1 as select repeat(' ', 64) as s1, repeat(' ',64) as s2 @@ -281,8 +284,8 @@ select null, null; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `s1` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, - `s2` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL + `s1` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_uca1400_ai_ci DEFAULT NULL, + `s2` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_uca1400_ai_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci delete from t1; insert into t1 values('aaa','aaa'); @@ -316,9 +319,13 @@ NULL NULL NULL drop table t1; +# +# Bug #3928 regexp [[:>:]] and UTF-8 +# SELECT @@character_set_client, @@collation_connection; @@character_set_client @@collation_connection -utf8mb4 utf8mb4_general_ci +utf8mb4 utf8mb4_uca1400_ai_ci +# This should return TRUE select 'вася' rlike '\\bвася\\b'; 'вася' rlike '\\bвася\\b' 1 @@ -343,6 +350,7 @@ select ' вася' rlike '[[:<:]]вася[[:>:]]'; select ' вася ' rlike '[[:<:]]вася[[:>:]]'; ' вася ' rlike '[[:<:]]вася[[:>:]]' 1 +# This should return FALSE select 'васяz' rlike '\\bвася\\b'; 'васяz' rlike '\\bвася\\b' 0 @@ -369,7 +377,7 @@ create table t1 (a enum('aaaa','проба') character set utf8mb4) engine InnoD show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` enum('aaaa','проба') CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL + `a` enum('aaaa','проба') CHARACTER SET utf8mb4 COLLATE utf8mb4_uca1400_ai_ci DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci insert into t1 values ('проба'); select * from t1; @@ -379,7 +387,7 @@ create table t2 engine InnoDB select ifnull(a,a) from t1; show create table t2; Table Create Table t2 CREATE TABLE `t2` ( - `ifnull(a,a)` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL + `ifnull(a,a)` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_uca1400_ai_ci DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci select * from t2; ifnull(a,a) @@ -505,7 +513,7 @@ unique key a using hash (c(1)) show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `c` char(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, + `c` char(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_uca1400_ai_ci DEFAULT NULL, UNIQUE KEY `a` (`c`(1)) USING HASH ) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci insert into t1 values ('a'),('b'),('c'),('d'),('e'),('f'); @@ -541,7 +549,7 @@ unique key a using btree (c(1)) show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `c` char(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, + `c` char(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_uca1400_ai_ci DEFAULT NULL, UNIQUE KEY `a` (`c`(1)) USING BTREE ) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci insert into t1 values ('a'),('b'),('c'),('d'),('e'),('f'); @@ -903,8 +911,8 @@ create table t2 engine InnoDB select concat(a,_utf8mb4'') as a, concat(b,_utf8mb show create table t2; Table Create Table t2 CREATE TABLE `t2` ( - `a` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, - `b` varchar(15) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL + `a` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_uca1400_ai_ci DEFAULT NULL, + `b` varchar(15) CHARACTER SET utf8mb4 COLLATE utf8mb4_uca1400_ai_ci DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop table t2; drop table t1; @@ -1468,7 +1476,7 @@ LENGTH(bug) 100 DROP TABLE t2; DROP TABLE t1; -CREATE TABLE t1 (item varchar(255)) default character set utf8mb4 ENGINE InnoDB; +CREATE TABLE t1 (item varchar(255)) default character set utf8mb4 collate utf8mb4_general_ci ENGINE InnoDB; INSERT INTO t1 VALUES (N'\\'); INSERT INTO t1 VALUES (_utf8mb4'\\'); INSERT INTO t1 VALUES (N'Cote d\'Ivoire'); @@ -1802,7 +1810,7 @@ SET CHARACTER SET utf8mb4; SHOW VARIABLES LIKE 'character\_set\_%'; Variable_name Value character_set_client utf8mb4 -character_set_collations +character_set_collations utf8mb3=utf8mb3_uca1400_ai_ci,ucs2=ucs2_uca1400_ai_ci,utf8mb4=utf8mb4_uca1400_ai_ci,utf16=utf16_uca1400_ai_ci,utf32=utf32_uca1400_ai_ci character_set_connection latin1 character_set_database latin1 character_set_filesystem binary @@ -1812,18 +1820,18 @@ character_set_system utf8mb3 SET @@character_set_server=@save_character_set_server; CREATE DATABASE crashtest DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin; USE crashtest; -CREATE TABLE crashtest (crash char(10)) DEFAULT CHARSET=utf8mb4 ENGINE InnoDB; +CREATE TABLE crashtest (crash char(10)) DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_general_ci ENGINE InnoDB; INSERT INTO crashtest VALUES ('35'), ('36'), ('37'); -SELECT * FROM crashtest ORDER BY CHAR(crash USING utf8mb4); +SELECT * FROM crashtest ORDER BY CHAR(crash USING utf8mb4) COLLATE utf8mb4_general_ci; crash 35 36 37 INSERT INTO crashtest VALUES ('-1000'); -EXPLAIN SELECT * FROM crashtest ORDER BY CHAR(crash USING utf8mb4); +EXPLAIN SELECT * FROM crashtest ORDER BY CHAR(crash USING utf8mb4) COLLATE utf8mb4_general_ci; id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE crashtest ALL NULL NULL NULL NULL 4 Using filesort -SELECT * FROM crashtest ORDER BY CHAR(crash USING utf8mb4); +SELECT * FROM crashtest ORDER BY CHAR(crash USING utf8mb4) COLLATE utf8mb4_general_ci; crash -1000 35 @@ -2000,7 +2008,7 @@ insert into t1 values('t1_val'); create view v1 as select 'v1_val' as col1; select coercibility(col1), collation(col1) from v1; coercibility(col1) collation(col1) -5 utf8mb4_general_ci +5 utf8mb4_uca1400_ai_ci create view v2 as select col1 from v1 union select col1 from t1; select coercibility(col1), collation(col1)from v2; coercibility(col1) collation(col1) @@ -2034,7 +2042,7 @@ select concat(a, if(b>10, _utf8mb4'x', _utf8mb4'y')) from t1; concat(a, if(b>10, _utf8mb4'x', _utf8mb4'y')) ay select concat(a, if(b>10, _utf8mb4'æ', _utf8mb4'ß')) from t1; -ERROR HY000: Illegal mix of collations (latin1_swedish_ci,IMPLICIT) and (utf8mb4_general_ci,COERCIBLE) for operation 'concat' +ERROR HY000: Illegal mix of collations (latin1_swedish_ci,IMPLICIT) and (utf8mb4_uca1400_ai_ci,COERCIBLE) for operation 'concat' drop table t1; set names utf8mb4; create table t1 (a varchar(10) character set latin1, b int) engine InnoDB; @@ -2043,7 +2051,7 @@ select concat(a, if(b>10, _utf8mb4 0x78, _utf8mb4 0x79)) from t1; concat(a, if(b>10, _utf8mb4 0x78, _utf8mb4 0x79)) ay select concat(a, if(b>10, _utf8mb4 0xC3A6, _utf8mb4 0xC3AF)) from t1; -ERROR HY000: Illegal mix of collations (latin1_swedish_ci,IMPLICIT) and (utf8mb4_general_ci,COERCIBLE) for operation 'concat' +ERROR HY000: Illegal mix of collations (latin1_swedish_ci,IMPLICIT) and (utf8mb4_uca1400_ai_ci,COERCIBLE) for operation 'concat' drop table t1; set names utf8mb4; create table t1 (a varchar(10) character set latin1, b int) engine InnoDB; @@ -2052,7 +2060,7 @@ select concat(a, if(b>10, 'x' 'x', 'y' 'y')) from t1; concat(a, if(b>10, 'x' 'x', 'y' 'y')) ayy select concat(a, if(b>10, 'x' 'æ', 'y' 'ß')) from t1; -ERROR HY000: Illegal mix of collations (latin1_swedish_ci,IMPLICIT) and (utf8mb4_general_ci,COERCIBLE) for operation 'concat' +ERROR HY000: Illegal mix of collations (latin1_swedish_ci,IMPLICIT) and (utf8mb4_uca1400_ai_ci,COERCIBLE) for operation 'concat' drop table t1; CREATE TABLE t1 ( colA int(11) NOT NULL, @@ -2185,7 +2193,7 @@ DROP TABLE IF EXISTS t1; CREATE TABLE t1 ( predicted_order int NOT NULL, utf8mb4_encoding VARCHAR(10) NOT NULL -) CHARACTER SET utf8mb4 ENGINE InnoDB; +) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci ENGINE InnoDB; INSERT INTO t1 VALUES (19, x'E0B696'), (30, x'E0B69AE0B798'), (61, x'E0B6AF'), (93, x'E0B799'), (52, x'E0B6A6'), (73, x'E0B6BBE0B78AE2808D'), (3, x'E0B686'), (56, x'E0B6AA'), (55, x'E0B6A9'), (70, x'E0B6B9'), (94, x'E0B79A'), (80, x'E0B785'), (25, x'E0B69AE0B791'), (48, x'E0B6A2'), (13, x'E0B690'), (86, x'E0B793'), (91, x'E0B79F'), (81, x'E0B786'), (79, x'E0B784'), (14, x'E0B691'), (99, x'E0B78A'), (8, x'E0B68B'), (68, x'E0B6B7'), (22, x'E0B69A'), (16, x'E0B693'), (33, x'E0B69AE0B7B3'), (38, x'E0B69AE0B79D'), (21, x'E0B683'), (11, x'E0B68E'), (77, x'E0B782'), (40, x'E0B69AE0B78A'), (101, x'E0B78AE2808DE0B6BB'), (35, x'E0B69AE0B79A'), (1, x'E0B7B4'), (9, x'E0B68C'), (96, x'E0B79C'), (6, x'E0B689'), (95, x'E0B79B'), (88, x'E0B796'), (64, x'E0B6B3'), (26, x'E0B69AE0B792'), (82, x'E0B78F'), (28, x'E0B69AE0B794'), (39, x'E0B69AE0B79E'), (97, x'E0B79D'), (2, x'E0B685'), (75, x'E0B780'), (34, x'E0B69AE0B799'), (69, x'E0B6B8'), (83, x'E0B790'), (18, x'E0B695'), (90, x'E0B7B2'), (17, x'E0B694'), (72, x'E0B6BB'), (66, x'E0B6B5'), (59, x'E0B6AD'), (44, x'E0B69E'), (15, x'E0B692'), (23, x'E0B69AE0B78F'), (65, x'E0B6B4'), (42, x'E0B69C'), (63, x'E0B6B1'), (85, x'E0B792'), (47, x'E0B6A1'), (49, x'E0B6A3'), (92, x'E0B7B3'), (78, x'E0B783'), (36, x'E0B69AE0B79B'), (4, x'E0B687'), (24, x'E0B69AE0B790'), (87, x'E0B794'), (37, x'E0B69AE0B79C'), (32, x'E0B69AE0B79F'), (29, x'E0B69AE0B796'), (43, x'E0B69D'), (62, x'E0B6B0'), (100, x'E0B78AE2808DE0B6BA'), (60, x'E0B6AE'), (45, x'E0B69F'), (12, x'E0B68F'), (46, x'E0B6A0'), (50, x'E0B6A5'), (51, x'E0B6A4'), (5, x'E0B688'), (76, x'E0B781'), (89, x'E0B798'), (74, x'E0B6BD'), (10, x'E0B68D'), (57, x'E0B6AB'), (71, x'E0B6BA'), (58, x'E0B6AC'), (27, x'E0B69AE0B793'), (54, x'E0B6A8'), (84, x'E0B791'), (31, x'E0B69AE0B7B2'), (98, x'E0B79E'), (53, x'E0B6A7'), (41, x'E0B69B'), (67, x'E0B6B6'), (7, x'E0B68A'), (20, x'E0B682'); SELECT predicted_order, hex(utf8mb4_encoding) FROM t1 ORDER BY utf8mb4_encoding COLLATE utf8mb4_sinhala_ci; predicted_order hex(utf8mb4_encoding) @@ -2367,7 +2375,7 @@ t1 CREATE TABLE `t1` ( `Tape` tinytext DEFAULT NULL, PRIMARY KEY (`clipid`), KEY `tape` (`Tape`(255)) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci DROP TABLE t1; # # Testing 4-byte values. @@ -2376,7 +2384,7 @@ DROP TABLE IF EXISTS t1; CREATE TABLE t1 ( u_decimal int NOT NULL, utf8mb4_encoding VARCHAR(10) NOT NULL -) CHARACTER SET utf8mb4 ENGINE InnoDB; +) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci ENGINE InnoDB; INSERT INTO t1 VALUES (119040, x'f09d8480'), # G CLEF (119070, x'f09d849e'), @@ -2421,7 +2429,7 @@ DROP TABLE IF EXISTS t2; CREATE TABLE t2 ( u_decimal int NOT NULL, utf8mb3_encoding VARCHAR(10) NOT NULL -) CHARACTER SET utf8mb3 ENGINE InnoDB; +) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci ENGINE InnoDB; INSERT INTO t2 VALUES (42856, x'ea9da8'); INSERT INTO t2 VALUES (65131, x'efb9ab'); INSERT IGNORE INTO t2 VALUES (1114111, x'f48fbfbf'); @@ -2492,7 +2500,7 @@ WHERE t1.utf8mb4_encoding > t2.utf8mb3_encoding; count(*) 33 SET STATEMENT sql_mode = 'NO_ENGINE_SUBSTITUTION' FOR -ALTER TABLE t1 CONVERT TO CHARACTER SET utf8; +ALTER TABLE t1 CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci; SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( @@ -2513,7 +2521,7 @@ u_decimal hex(utf8mb4_encoding) utf8mb4_encoding 120735 3F ? 65131 EFB9AB3F3F3F3F3FEFB9ABEFB9AB3FEFB9AB ﹫?????﹫﹫?﹫ 917999 3F ? -ALTER TABLE t2 CONVERT TO CHARACTER SET utf8mb4; +ALTER TABLE t2 CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( @@ -2525,7 +2533,7 @@ u_decimal hex(utf8mb3_encoding) 1114111 3F3F3F3F 42856 EA9DA8 65131 EFB9AB -ALTER TABLE t2 CONVERT TO CHARACTER SET utf8mb3; +ALTER TABLE t2 CONVERT TO CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci; SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( @@ -2537,7 +2545,7 @@ u_decimal hex(utf8mb3_encoding) 1114111 3F3F3F3F 42856 EA9DA8 65131 EFB9AB -ALTER TABLE t1 MODIFY utf8mb4_encoding VARCHAR(10) CHARACTER SET utf8mb3; +ALTER TABLE t1 MODIFY utf8mb4_encoding VARCHAR(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci; SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( @@ -2558,7 +2566,7 @@ u_decimal hex(utf8mb4_encoding) 120735 3F 65131 EFB9AB3F3F3F3F3FEFB9ABEFB9AB3FEFB9AB 917999 3F -ALTER TABLE t1 MODIFY utf8mb4_encoding VARCHAR(10) CHARACTER SET utf8mb4; +ALTER TABLE t1 MODIFY utf8mb4_encoding VARCHAR(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( @@ -2579,7 +2587,7 @@ u_decimal hex(utf8mb4_encoding) 120735 3F 65131 EFB9AB3F3F3F3F3FEFB9ABEFB9AB3FEFB9AB 917999 3F -ALTER TABLE t2 MODIFY utf8mb3_encoding VARCHAR(10) CHARACTER SET utf8mb4; +ALTER TABLE t2 MODIFY utf8mb3_encoding VARCHAR(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( @@ -2595,13 +2603,13 @@ DROP TABLE IF EXISTS t3; CREATE TABLE t3 ( u_decimal int NOT NULL, utf8mb3_encoding VARCHAR(10) NOT NULL -) CHARACTER SET utf8 ENGINE InnoDB; +) CHARACTER SET utf8 COLLATE utf8_general_ci ENGINE InnoDB; INSERT INTO t3 SELECT * FROM t1; DROP TABLE IF EXISTS t4; CREATE TABLE t4 ( u_decimal int NOT NULL, utf8mb4_encoding VARCHAR(10) NOT NULL -) CHARACTER SET utf8mb4 ENGINE InnoDB; +) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci ENGINE InnoDB; INSERT INTO t3 SELECT * FROM t2; DROP TABLE t1; DROP TABLE t2; @@ -2613,11 +2621,11 @@ DROP TABLE t4; SELECT CHARSET(CONCAT(_utf8mb4'a',_utf8'b')); CHARSET(CONCAT(_utf8mb4'a',_utf8'b')) utf8mb4 -CREATE TABLE t1 (utf8mb4 VARCHAR(10) CHARACTER SET utf8mb4 NOT NULL) ENGINE InnoDB; +CREATE TABLE t1 (utf8mb4 VARCHAR(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL) ENGINE InnoDB; INSERT INTO t1 VALUES (x'ea9da8'),(x'f48fbfbf'); SELECT CONCAT(utf8mb4, _utf8 x'ea9da8') FROM t1 LIMIT 0; CONCAT(utf8mb4, _utf8 x'ea9da8') -CREATE TABLE t2 (utf8mb3 VARCHAR(10) CHARACTER SET utf8mb3 NOT NULL) ENGINE InnoDB; +CREATE TABLE t2 (utf8mb3 VARCHAR(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL) ENGINE InnoDB; INSERT INTO t2 VALUES (x'ea9da8'); SELECT HEX(CONCAT(utf8mb4, utf8mb3)) FROM t1,t2 ORDER BY 1; HEX(CONCAT(utf8mb4, utf8mb3)) @@ -2648,12 +2656,12 @@ DROP TABLE t2; # # Check that mixing utf8mb4 with an invalid utf8 constant returns error # -CREATE TABLE t1 (utf8mb4 VARCHAR(10) CHARACTER SET utf8mb4) ENGINE InnoDB; +CREATE TABLE t1 (utf8mb4 VARCHAR(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci) ENGINE InnoDB; INSERT INTO t1 VALUES (x'f48fbfbf'); SELECT CONCAT(utf8mb4, _utf8 '') FROM t1; -ERROR HY000: Illegal mix of collations (utf8mb4_general_ci,IMPLICIT) and (utf8mb3_general_ci,COERCIBLE) for operation 'concat' +ERROR HY000: Illegal mix of collations (utf8mb4_general_ci,IMPLICIT) and (utf8mb3_uca1400_ai_ci,COERCIBLE) for operation 'concat' SELECT CONCAT('a', _utf8 '') FROM t1; -ERROR HY000: Illegal mix of collations (utf8mb4_general_ci,COERCIBLE) and (utf8mb3_general_ci,COERCIBLE) for operation 'concat' +ERROR HY000: Illegal mix of collations (utf8mb4_uca1400_ai_ci,COERCIBLE) and (utf8mb3_uca1400_ai_ci,COERCIBLE) for operation 'concat' DROP TABLE t1; # # End of 5.5 tests @@ -2666,7 +2674,8 @@ DROP TABLE t1; # CREATE TABLE t1 ( id INT NOT NULL AUTO_INCREMENT PRIMARY KEY, -a VARCHAR(10) CHARACTER SET utf8mb4, KEY(a,id) +a VARCHAR(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci, +KEY(a,id) ); INSERT INTO t1 (a) VALUES (0x61); INSERT INTO t1 (a) VALUES (0xC280),(0xDFBF); diff --git a/mysql-test/main/ctype_utf8mb4_myisam.result b/mysql-test/main/ctype_utf8mb4_myisam.result index 404fc5710de..069d9cce26e 100644 --- a/mysql-test/main/ctype_utf8mb4_myisam.result +++ b/mysql-test/main/ctype_utf8mb4_myisam.result @@ -75,20 +75,20 @@ CONVERT(_koi8r'\xD7\xC1\xD3\xD1' USING utf8mb4) LIKE CONVERT(_koi8r'\xF7\xE1\xF3 select CONVERT(_koi8r'' USING utf8mb4) LIKE CONVERT(_koi8r'' USING utf8mb4); CONVERT(_koi8r'\xF7\xE1\xF3\xF1' USING utf8mb4) LIKE CONVERT(_koi8r'\xD7\xC1\xD3\xD1' USING utf8mb4) 1 -SELECT 'a' = 'a '; -'a' = 'a ' +SELECT 'a' = 'a ' collate utf8mb4_general_ci; +'a' = 'a ' collate utf8mb4_general_ci 1 -SELECT 'a\0' < 'a'; -'a\0' < 'a' +SELECT 'a\0' < 'a' collate utf8mb4_general_ci; +'a\0' < 'a' collate utf8mb4_general_ci 1 -SELECT 'a\0' < 'a '; -'a\0' < 'a ' +SELECT 'a\0' < 'a ' collate utf8mb4_general_ci; +'a\0' < 'a ' collate utf8mb4_general_ci 1 -SELECT 'a\t' < 'a'; -'a\t' < 'a' +SELECT 'a\t' < 'a' collate utf8mb4_general_ci; +'a\t' < 'a' collate utf8mb4_general_ci 1 -SELECT 'a\t' < 'a '; -'a\t' < 'a ' +SELECT 'a\t' < 'a ' collate utf8mb4_general_ci; +'a\t' < 'a ' collate utf8mb4_general_ci 1 SELECT 'a' = 'a ' collate utf8mb4_bin; 'a' = 'a ' collate utf8mb4_bin @@ -105,7 +105,7 @@ SELECT 'a\t' < 'a' collate utf8mb4_bin; SELECT 'a\t' < 'a ' collate utf8mb4_bin; 'a\t' < 'a ' collate utf8mb4_bin 1 -CREATE TABLE t1 (a char(10) character set utf8mb4 not null) ENGINE MyISAM; +CREATE TABLE t1 (a char(10) character set utf8mb4 collate utf8mb4_general_ci not null) ENGINE MyISAM; INSERT INTO t1 VALUES ('a'),('a\0'),('a\t'),('a '); SELECT hex(a),STRCMP(a,'a'), STRCMP(a,'a ') FROM t1; hex(a) STRCMP(a,'a') STRCMP(a,'a ') @@ -127,7 +127,7 @@ create table t1 ENGINE MyISAM select date_format("2004-01-19 10:10:10", "%Y-%m-% show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `date_format("2004-01-19 10:10:10", "%Y-%m-%d")` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL + `date_format("2004-01-19 10:10:10", "%Y-%m-%d")` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_uca1400_ai_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci select * from t1; date_format("2004-01-19 10:10:10", "%Y-%m-%d") @@ -276,6 +276,9 @@ select * from t1 where a = 'b' and a != 'b'; a drop table t1; set names utf8mb4; +# +# Bug#31081 server crash in regexp function +# drop table if exists t1; create table t1 as select repeat(' ', 64) as s1, repeat(' ',64) as s2 @@ -284,8 +287,8 @@ select null, null; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `s1` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, - `s2` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL + `s1` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_uca1400_ai_ci DEFAULT NULL, + `s2` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_uca1400_ai_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci delete from t1; insert into t1 values('aaa','aaa'); @@ -319,9 +322,13 @@ NULL NULL NULL drop table t1; +# +# Bug #3928 regexp [[:>:]] and UTF-8 +# SELECT @@character_set_client, @@collation_connection; @@character_set_client @@collation_connection -utf8mb4 utf8mb4_general_ci +utf8mb4 utf8mb4_uca1400_ai_ci +# This should return TRUE select 'вася' rlike '\\bвася\\b'; 'вася' rlike '\\bвася\\b' 1 @@ -346,6 +353,7 @@ select ' вася' rlike '[[:<:]]вася[[:>:]]'; select ' вася ' rlike '[[:<:]]вася[[:>:]]'; ' вася ' rlike '[[:<:]]вася[[:>:]]' 1 +# This should return FALSE select 'васяz' rlike '\\bвася\\b'; 'васяz' rlike '\\bвася\\b' 0 @@ -372,7 +380,7 @@ create table t1 (a enum('aaaa','проба') character set utf8mb4) engine MyISA show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` enum('aaaa','проба') CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL + `a` enum('aaaa','проба') CHARACTER SET utf8mb4 COLLATE utf8mb4_uca1400_ai_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci insert into t1 values ('проба'); select * from t1; @@ -382,7 +390,7 @@ create table t2 engine MyISAM select ifnull(a,a) from t1; show create table t2; Table Create Table t2 CREATE TABLE `t2` ( - `ifnull(a,a)` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL + `ifnull(a,a)` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_uca1400_ai_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci select * from t2; ifnull(a,a) @@ -508,7 +516,7 @@ unique key a using hash (c(1)) show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `c` char(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, + `c` char(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_uca1400_ai_ci DEFAULT NULL, UNIQUE KEY `a` (`c`(1)) USING HASH ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci insert into t1 values ('a'),('b'),('c'),('d'),('e'),('f'); @@ -544,7 +552,7 @@ unique key a using btree (c(1)) show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `c` char(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, + `c` char(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_uca1400_ai_ci DEFAULT NULL, UNIQUE KEY `a` (`c`(1)) USING BTREE ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci insert into t1 values ('a'),('b'),('c'),('d'),('e'),('f'); @@ -906,8 +914,8 @@ create table t2 engine MyISAM select concat(a,_utf8mb4'') as a, concat(b,_utf8mb show create table t2; Table Create Table t2 CREATE TABLE `t2` ( - `a` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, - `b` varchar(15) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL + `a` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_uca1400_ai_ci DEFAULT NULL, + `b` varchar(15) CHARACTER SET utf8mb4 COLLATE utf8mb4_uca1400_ai_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop table t2; drop table t1; @@ -1473,7 +1481,7 @@ LENGTH(bug) 100 DROP TABLE t2; DROP TABLE t1; -CREATE TABLE t1 (item varchar(255)) default character set utf8mb4 ENGINE MyISAM; +CREATE TABLE t1 (item varchar(255)) default character set utf8mb4 collate utf8mb4_general_ci ENGINE MyISAM; INSERT INTO t1 VALUES (N'\\'); INSERT INTO t1 VALUES (_utf8mb4'\\'); INSERT INTO t1 VALUES (N'Cote d\'Ivoire'); @@ -1809,7 +1817,7 @@ SET CHARACTER SET utf8mb4; SHOW VARIABLES LIKE 'character\_set\_%'; Variable_name Value character_set_client utf8mb4 -character_set_collations +character_set_collations utf8mb3=utf8mb3_uca1400_ai_ci,ucs2=ucs2_uca1400_ai_ci,utf8mb4=utf8mb4_uca1400_ai_ci,utf16=utf16_uca1400_ai_ci,utf32=utf32_uca1400_ai_ci character_set_connection latin1 character_set_database latin1 character_set_filesystem binary @@ -1819,18 +1827,18 @@ character_set_system utf8mb3 SET @@character_set_server=@save_character_set_server; CREATE DATABASE crashtest DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin; USE crashtest; -CREATE TABLE crashtest (crash char(10)) DEFAULT CHARSET=utf8mb4 ENGINE MyISAM; +CREATE TABLE crashtest (crash char(10)) DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_general_ci ENGINE MyISAM; INSERT INTO crashtest VALUES ('35'), ('36'), ('37'); -SELECT * FROM crashtest ORDER BY CHAR(crash USING utf8mb4); +SELECT * FROM crashtest ORDER BY CHAR(crash USING utf8mb4) COLLATE utf8mb4_general_ci; crash 35 36 37 INSERT INTO crashtest VALUES ('-1000'); -EXPLAIN SELECT * FROM crashtest ORDER BY CHAR(crash USING utf8mb4); +EXPLAIN SELECT * FROM crashtest ORDER BY CHAR(crash USING utf8mb4) COLLATE utf8mb4_general_ci; id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE crashtest ALL NULL NULL NULL NULL 4 Using filesort -SELECT * FROM crashtest ORDER BY CHAR(crash USING utf8mb4); +SELECT * FROM crashtest ORDER BY CHAR(crash USING utf8mb4) COLLATE utf8mb4_general_ci; crash -1000 35 @@ -2007,7 +2015,7 @@ insert into t1 values('t1_val'); create view v1 as select 'v1_val' as col1; select coercibility(col1), collation(col1) from v1; coercibility(col1) collation(col1) -5 utf8mb4_general_ci +5 utf8mb4_uca1400_ai_ci create view v2 as select col1 from v1 union select col1 from t1; select coercibility(col1), collation(col1)from v2; coercibility(col1) collation(col1) @@ -2041,7 +2049,7 @@ select concat(a, if(b>10, _utf8mb4'x', _utf8mb4'y')) from t1; concat(a, if(b>10, _utf8mb4'x', _utf8mb4'y')) ay select concat(a, if(b>10, _utf8mb4'æ', _utf8mb4'ß')) from t1; -ERROR HY000: Illegal mix of collations (latin1_swedish_ci,IMPLICIT) and (utf8mb4_general_ci,COERCIBLE) for operation 'concat' +ERROR HY000: Illegal mix of collations (latin1_swedish_ci,IMPLICIT) and (utf8mb4_uca1400_ai_ci,COERCIBLE) for operation 'concat' drop table t1; set names utf8mb4; create table t1 (a varchar(10) character set latin1, b int) engine MyISAM; @@ -2050,7 +2058,7 @@ select concat(a, if(b>10, _utf8mb4 0x78, _utf8mb4 0x79)) from t1; concat(a, if(b>10, _utf8mb4 0x78, _utf8mb4 0x79)) ay select concat(a, if(b>10, _utf8mb4 0xC3A6, _utf8mb4 0xC3AF)) from t1; -ERROR HY000: Illegal mix of collations (latin1_swedish_ci,IMPLICIT) and (utf8mb4_general_ci,COERCIBLE) for operation 'concat' +ERROR HY000: Illegal mix of collations (latin1_swedish_ci,IMPLICIT) and (utf8mb4_uca1400_ai_ci,COERCIBLE) for operation 'concat' drop table t1; set names utf8mb4; create table t1 (a varchar(10) character set latin1, b int) engine MyISAM; @@ -2059,7 +2067,7 @@ select concat(a, if(b>10, 'x' 'x', 'y' 'y')) from t1; concat(a, if(b>10, 'x' 'x', 'y' 'y')) ayy select concat(a, if(b>10, 'x' 'æ', 'y' 'ß')) from t1; -ERROR HY000: Illegal mix of collations (latin1_swedish_ci,IMPLICIT) and (utf8mb4_general_ci,COERCIBLE) for operation 'concat' +ERROR HY000: Illegal mix of collations (latin1_swedish_ci,IMPLICIT) and (utf8mb4_uca1400_ai_ci,COERCIBLE) for operation 'concat' drop table t1; CREATE TABLE t1 ( colA int(11) NOT NULL, @@ -2192,7 +2200,7 @@ DROP TABLE IF EXISTS t1; CREATE TABLE t1 ( predicted_order int NOT NULL, utf8mb4_encoding VARCHAR(10) NOT NULL -) CHARACTER SET utf8mb4 ENGINE MyISAM; +) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci ENGINE MyISAM; INSERT INTO t1 VALUES (19, x'E0B696'), (30, x'E0B69AE0B798'), (61, x'E0B6AF'), (93, x'E0B799'), (52, x'E0B6A6'), (73, x'E0B6BBE0B78AE2808D'), (3, x'E0B686'), (56, x'E0B6AA'), (55, x'E0B6A9'), (70, x'E0B6B9'), (94, x'E0B79A'), (80, x'E0B785'), (25, x'E0B69AE0B791'), (48, x'E0B6A2'), (13, x'E0B690'), (86, x'E0B793'), (91, x'E0B79F'), (81, x'E0B786'), (79, x'E0B784'), (14, x'E0B691'), (99, x'E0B78A'), (8, x'E0B68B'), (68, x'E0B6B7'), (22, x'E0B69A'), (16, x'E0B693'), (33, x'E0B69AE0B7B3'), (38, x'E0B69AE0B79D'), (21, x'E0B683'), (11, x'E0B68E'), (77, x'E0B782'), (40, x'E0B69AE0B78A'), (101, x'E0B78AE2808DE0B6BB'), (35, x'E0B69AE0B79A'), (1, x'E0B7B4'), (9, x'E0B68C'), (96, x'E0B79C'), (6, x'E0B689'), (95, x'E0B79B'), (88, x'E0B796'), (64, x'E0B6B3'), (26, x'E0B69AE0B792'), (82, x'E0B78F'), (28, x'E0B69AE0B794'), (39, x'E0B69AE0B79E'), (97, x'E0B79D'), (2, x'E0B685'), (75, x'E0B780'), (34, x'E0B69AE0B799'), (69, x'E0B6B8'), (83, x'E0B790'), (18, x'E0B695'), (90, x'E0B7B2'), (17, x'E0B694'), (72, x'E0B6BB'), (66, x'E0B6B5'), (59, x'E0B6AD'), (44, x'E0B69E'), (15, x'E0B692'), (23, x'E0B69AE0B78F'), (65, x'E0B6B4'), (42, x'E0B69C'), (63, x'E0B6B1'), (85, x'E0B792'), (47, x'E0B6A1'), (49, x'E0B6A3'), (92, x'E0B7B3'), (78, x'E0B783'), (36, x'E0B69AE0B79B'), (4, x'E0B687'), (24, x'E0B69AE0B790'), (87, x'E0B794'), (37, x'E0B69AE0B79C'), (32, x'E0B69AE0B79F'), (29, x'E0B69AE0B796'), (43, x'E0B69D'), (62, x'E0B6B0'), (100, x'E0B78AE2808DE0B6BA'), (60, x'E0B6AE'), (45, x'E0B69F'), (12, x'E0B68F'), (46, x'E0B6A0'), (50, x'E0B6A5'), (51, x'E0B6A4'), (5, x'E0B688'), (76, x'E0B781'), (89, x'E0B798'), (74, x'E0B6BD'), (10, x'E0B68D'), (57, x'E0B6AB'), (71, x'E0B6BA'), (58, x'E0B6AC'), (27, x'E0B69AE0B793'), (54, x'E0B6A8'), (84, x'E0B791'), (31, x'E0B69AE0B7B2'), (98, x'E0B79E'), (53, x'E0B6A7'), (41, x'E0B69B'), (67, x'E0B6B6'), (7, x'E0B68A'), (20, x'E0B682'); SELECT predicted_order, hex(utf8mb4_encoding) FROM t1 ORDER BY utf8mb4_encoding COLLATE utf8mb4_sinhala_ci; predicted_order hex(utf8mb4_encoding) @@ -2376,7 +2384,7 @@ t1 CREATE TABLE `t1` ( `Tape` tinytext DEFAULT NULL, PRIMARY KEY (`clipid`), KEY `tape` (`Tape`(250)) -) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci +) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci DROP TABLE t1; # # Testing 4-byte values. @@ -2385,7 +2393,7 @@ DROP TABLE IF EXISTS t1; CREATE TABLE t1 ( u_decimal int NOT NULL, utf8mb4_encoding VARCHAR(10) NOT NULL -) CHARACTER SET utf8mb4 ENGINE MyISAM; +) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci ENGINE MyISAM; INSERT INTO t1 VALUES (119040, x'f09d8480'), # G CLEF (119070, x'f09d849e'), @@ -2430,7 +2438,7 @@ DROP TABLE IF EXISTS t2; CREATE TABLE t2 ( u_decimal int NOT NULL, utf8mb3_encoding VARCHAR(10) NOT NULL -) CHARACTER SET utf8mb3 ENGINE MyISAM; +) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci ENGINE MyISAM; INSERT INTO t2 VALUES (42856, x'ea9da8'); INSERT INTO t2 VALUES (65131, x'efb9ab'); INSERT IGNORE INTO t2 VALUES (1114111, x'f48fbfbf'); @@ -2501,7 +2509,7 @@ WHERE t1.utf8mb4_encoding > t2.utf8mb3_encoding; count(*) 33 SET STATEMENT sql_mode = 'NO_ENGINE_SUBSTITUTION' FOR -ALTER TABLE t1 CONVERT TO CHARACTER SET utf8; +ALTER TABLE t1 CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci; SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( @@ -2522,7 +2530,7 @@ u_decimal hex(utf8mb4_encoding) utf8mb4_encoding 120735 3F ? 65131 EFB9AB3F3F3F3F3FEFB9ABEFB9AB3FEFB9AB ﹫?????﹫﹫?﹫ 917999 3F ? -ALTER TABLE t2 CONVERT TO CHARACTER SET utf8mb4; +ALTER TABLE t2 CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( @@ -2534,7 +2542,7 @@ u_decimal hex(utf8mb3_encoding) 1114111 3F3F3F3F 42856 EA9DA8 65131 EFB9AB -ALTER TABLE t2 CONVERT TO CHARACTER SET utf8mb3; +ALTER TABLE t2 CONVERT TO CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci; SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( @@ -2546,7 +2554,7 @@ u_decimal hex(utf8mb3_encoding) 1114111 3F3F3F3F 42856 EA9DA8 65131 EFB9AB -ALTER TABLE t1 MODIFY utf8mb4_encoding VARCHAR(10) CHARACTER SET utf8mb3; +ALTER TABLE t1 MODIFY utf8mb4_encoding VARCHAR(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci; SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( @@ -2567,7 +2575,7 @@ u_decimal hex(utf8mb4_encoding) 120735 3F 65131 EFB9AB3F3F3F3F3FEFB9ABEFB9AB3FEFB9AB 917999 3F -ALTER TABLE t1 MODIFY utf8mb4_encoding VARCHAR(10) CHARACTER SET utf8mb4; +ALTER TABLE t1 MODIFY utf8mb4_encoding VARCHAR(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( @@ -2588,7 +2596,7 @@ u_decimal hex(utf8mb4_encoding) 120735 3F 65131 EFB9AB3F3F3F3F3FEFB9ABEFB9AB3FEFB9AB 917999 3F -ALTER TABLE t2 MODIFY utf8mb3_encoding VARCHAR(10) CHARACTER SET utf8mb4; +ALTER TABLE t2 MODIFY utf8mb3_encoding VARCHAR(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( @@ -2604,13 +2612,13 @@ DROP TABLE IF EXISTS t3; CREATE TABLE t3 ( u_decimal int NOT NULL, utf8mb3_encoding VARCHAR(10) NOT NULL -) CHARACTER SET utf8 ENGINE MyISAM; +) CHARACTER SET utf8 COLLATE utf8_general_ci ENGINE MyISAM; INSERT INTO t3 SELECT * FROM t1; DROP TABLE IF EXISTS t4; CREATE TABLE t4 ( u_decimal int NOT NULL, utf8mb4_encoding VARCHAR(10) NOT NULL -) CHARACTER SET utf8mb4 ENGINE MyISAM; +) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci ENGINE MyISAM; INSERT INTO t3 SELECT * FROM t2; DROP TABLE t1; DROP TABLE t2; @@ -2622,11 +2630,11 @@ DROP TABLE t4; SELECT CHARSET(CONCAT(_utf8mb4'a',_utf8'b')); CHARSET(CONCAT(_utf8mb4'a',_utf8'b')) utf8mb4 -CREATE TABLE t1 (utf8mb4 VARCHAR(10) CHARACTER SET utf8mb4 NOT NULL) ENGINE MyISAM; +CREATE TABLE t1 (utf8mb4 VARCHAR(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL) ENGINE MyISAM; INSERT INTO t1 VALUES (x'ea9da8'),(x'f48fbfbf'); SELECT CONCAT(utf8mb4, _utf8 x'ea9da8') FROM t1 LIMIT 0; CONCAT(utf8mb4, _utf8 x'ea9da8') -CREATE TABLE t2 (utf8mb3 VARCHAR(10) CHARACTER SET utf8mb3 NOT NULL) ENGINE MyISAM; +CREATE TABLE t2 (utf8mb3 VARCHAR(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL) ENGINE MyISAM; INSERT INTO t2 VALUES (x'ea9da8'); SELECT HEX(CONCAT(utf8mb4, utf8mb3)) FROM t1,t2 ORDER BY 1; HEX(CONCAT(utf8mb4, utf8mb3)) @@ -2657,12 +2665,12 @@ DROP TABLE t2; # # Check that mixing utf8mb4 with an invalid utf8 constant returns error # -CREATE TABLE t1 (utf8mb4 VARCHAR(10) CHARACTER SET utf8mb4) ENGINE MyISAM; +CREATE TABLE t1 (utf8mb4 VARCHAR(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci) ENGINE MyISAM; INSERT INTO t1 VALUES (x'f48fbfbf'); SELECT CONCAT(utf8mb4, _utf8 '') FROM t1; -ERROR HY000: Illegal mix of collations (utf8mb4_general_ci,IMPLICIT) and (utf8mb3_general_ci,COERCIBLE) for operation 'concat' +ERROR HY000: Illegal mix of collations (utf8mb4_general_ci,IMPLICIT) and (utf8mb3_uca1400_ai_ci,COERCIBLE) for operation 'concat' SELECT CONCAT('a', _utf8 '') FROM t1; -ERROR HY000: Illegal mix of collations (utf8mb4_general_ci,COERCIBLE) and (utf8mb3_general_ci,COERCIBLE) for operation 'concat' +ERROR HY000: Illegal mix of collations (utf8mb4_uca1400_ai_ci,COERCIBLE) and (utf8mb3_uca1400_ai_ci,COERCIBLE) for operation 'concat' DROP TABLE t1; # # End of 5.5 tests @@ -2675,7 +2683,8 @@ DROP TABLE t1; # CREATE TABLE t1 ( id INT NOT NULL AUTO_INCREMENT PRIMARY KEY, -a VARCHAR(10) CHARACTER SET utf8mb4, KEY(a,id) +a VARCHAR(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci, +KEY(a,id) ); INSERT INTO t1 (a) VALUES (0x61); INSERT INTO t1 (a) VALUES (0xC280),(0xDFBF); diff --git a/mysql-test/main/ctype_utf8mb4_uca.result b/mysql-test/main/ctype_utf8mb4_uca.result index 3cd25891119..21391040417 100644 --- a/mysql-test/main/ctype_utf8mb4_uca.result +++ b/mysql-test/main/ctype_utf8mb4_uca.result @@ -7728,7 +7728,7 @@ VARIABLE_NAME VARIABLE_VALUE CHARACTER_SET_CLIENT utf8mb4 CHARACTER_SET_CONNECTION utf8mb4 CHARACTER_SET_RESULTS utf8mb4 -COLLATION_CONNECTION utf8mb4_general_ci +COLLATION_CONNECTION utf8mb4_uca1400_ai_ci --- SET NAMES utf8mb4 COLLATE `binary`; ERROR 42000: COLLATION 'binary' is not valid for CHARACTER SET 'utf8mb4' @@ -7737,7 +7737,7 @@ VARIABLE_NAME VARIABLE_VALUE CHARACTER_SET_CLIENT utf8mb4 CHARACTER_SET_CONNECTION utf8mb4 CHARACTER_SET_RESULTS utf8mb4 -COLLATION_CONNECTION utf8mb4_general_ci +COLLATION_CONNECTION utf8mb4_uca1400_ai_ci --- SET NAMES utf8mb4 COLLATE DEFAULT; SELECT * FROM vars; @@ -7745,7 +7745,7 @@ VARIABLE_NAME VARIABLE_VALUE CHARACTER_SET_CLIENT utf8mb4 CHARACTER_SET_CONNECTION utf8mb4 CHARACTER_SET_RESULTS utf8mb4 -COLLATION_CONNECTION utf8mb4_general_ci +COLLATION_CONNECTION utf8mb4_uca1400_ai_ci --- SET NAMES utf8mb4 COLLATE utf8mb4_uca1400_ai_ci; SELECT * FROM vars; @@ -7783,7 +7783,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `a` varchar(10) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci +) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci DROP TABLE t1; CREATE TABLE t1 (a VARCHAR(10) CHARACTER SET latin1); ALTER TABLE t1 CONVERT TO CHARACTER SET DEFAULT COLLATE latin1_bin; @@ -7811,7 +7811,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `a` varchar(10) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci +) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci DROP TABLE t1; CREATE TABLE t1 (a VARCHAR(10) CHARACTER SET latin1); ALTER TABLE t1 CONVERT TO CHARACTER SET utf8mb4 COLLATE DEFAULT; @@ -7819,7 +7819,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `a` varchar(10) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci +) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci DROP TABLE t1; CREATE TABLE t1 (a VARCHAR(10) CHARACTER SET latin1); ALTER TABLE t1 CONVERT TO CHARACTER SET utf8mb4 COLLATE latin1_bin; @@ -7889,7 +7889,7 @@ DROP DATABASE db1; CREATE DATABASE db1 COLLATE DEFAULT; SHOW CREATE DATABASE db1; Database Create Database -db1 CREATE DATABASE `db1` /*!40100 DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci */ +db1 CREATE DATABASE `db1` /*!40100 DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_uca1400_ai_ci */ DROP DATABASE db1; CREATE DATABASE db1 COLLATE uca1400_ai_ci; SHOW CREATE DATABASE db1; @@ -7909,7 +7909,7 @@ DROP DATABASE db1; CREATE DATABASE db1 CHARACTER SET DEFAULT COLLATE DEFAULT; SHOW CREATE DATABASE db1; Database Create Database -db1 CREATE DATABASE `db1` /*!40100 DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci */ +db1 CREATE DATABASE `db1` /*!40100 DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_uca1400_ai_ci */ DROP DATABASE db1; CREATE DATABASE db1 CHARACTER SET DEFAULT COLLATE uca1400_ai_ci; SHOW CREATE DATABASE db1; @@ -7953,7 +7953,7 @@ SHOW CREATE TABLE db1.t1; Table Create Table t1 CREATE TABLE `t1` ( `a` char(1) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci +) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci DROP TABLE db1.t1; CREATE TABLE db1.t1 (a CHAR(1)) COLLATE uca1400_ai_ci; SHOW CREATE TABLE db1.t1; @@ -7981,7 +7981,7 @@ SHOW CREATE TABLE db1.t1; Table Create Table t1 CREATE TABLE `t1` ( `a` char(1) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci +) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci DROP TABLE db1.t1; CREATE TABLE db1.t1 (a CHAR(1)) CHARACTER SET DEFAULT COLLATE uca1400_ai_ci; SHOW CREATE TABLE db1.t1; diff --git a/mysql-test/main/ctype_utf8mb4_uca1400_ai_ci.result b/mysql-test/main/ctype_utf8mb4_uca1400_ai_ci.result new file mode 100644 index 00000000000..b831e38c279 --- /dev/null +++ b/mysql-test/main/ctype_utf8mb4_uca1400_ai_ci.result @@ -0,0 +1,622 @@ +# +# Start of 5.5 tests +# +SET NAMES utf8mb4 COLLATE uca1400_ai_ci; +SELECT COLLATION('a'); +COLLATION('a') +utf8mb4_uca1400_ai_ci +SELECT 'a' = 'a ' AS c; +c +1 +SELECT 'a\0' = 'a' AS c; +c +1 +SELECT 'a\0' = 'a ' AS c; +c +1 +SELECT 'a\t' = 'a' AS c; +c +0 +SELECT 'a\t' = 'a ' AS c; +c +0 +SELECT 'a' < 'a ' AS c; +c +0 +SELECT 'a\0' < 'a' AS c; +c +0 +SELECT 'a\0' < 'a ' AS c; +c +0 +SELECT 'a\t' < 'a' AS c; +c +1 +SELECT 'a\t' < 'a ' AS c; +c +1 +SELECT 'a' > 'a ' AS c; +c +0 +SELECT 'a\0' > 'a' AS c; +c +0 +SELECT 'a\0' > 'a ' AS c; +c +0 +SELECT 'a\t' > 'a' AS c; +c +0 +SELECT 'a\t' > 'a ' AS c; +c +0 +CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS a LIMIT 0; +EXECUTE IMMEDIATE +REPLACE(REPLACE( +"ALTER TABLE t1 ADD a_readable " + "TEXT CHARACTER SET latin1 COLLATE DEFAULT " + "GENERATED ALWAYS AS " + "(RPAD(QUOTE(REGEXP_REPLACE(t1.a, '(\\\\x{00}|\\\\x{09})', '.')), 10))", +'DEFAULT', collation('a')), +'latin1', charset('a')); +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `a` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_uca1400_ai_ci DEFAULT NULL, + `a_readable` text CHARACTER SET utf8mb4 COLLATE utf8mb4_uca1400_ai_ci GENERATED ALWAYS AS (rpad(quote(regexp_replace(`a`,'(\\x{00}|\\x{09})','.')),10)) VIRTUAL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci +INSERT INTO t1 (a) VALUES ('a'),('a\0'),('a\t'),('a '); +SELECT hex(a),STRCMP(a,'a'), STRCMP(a,'a ') FROM t1; +hex(a) STRCMP(a,'a') STRCMP(a,'a ') +61 0 0 +6100 0 0 +6109 -1 -1 +6120 0 0 +SELECT HEX(a), a_readable FROM t1 ORDER BY a, BINARY a; +HEX(a) a_readable +6109 'a.' +61 'a' +6100 'a.' +6120 'a ' +SELECT +HEX(t1.a) AS t1a, +CASE STRCMP(t1.a, t2.a) WHEN -1 THEN '<' WHEN 1 THEN '>' ELSE '=' END AS cmp, +HEX(t2.a) AS t2a, +t1.a_readable, +t2.a_readable +FROM t1 t1, t1 t2 +ORDER BY BINARY t1.a, BINARY t2.a; +t1a cmp t2a a_readable a_readable +61 = 61 'a' 'a' +61 = 6100 'a' 'a.' +61 > 6109 'a' 'a.' +61 = 6120 'a' 'a ' +6100 = 61 'a.' 'a' +6100 = 6100 'a.' 'a.' +6100 > 6109 'a.' 'a.' +6100 = 6120 'a.' 'a ' +6109 < 61 'a.' 'a' +6109 < 6100 'a.' 'a.' +6109 = 6109 'a.' 'a.' +6109 < 6120 'a.' 'a ' +6120 = 61 'a ' 'a' +6120 = 6100 'a ' 'a.' +6120 > 6109 'a ' 'a.' +6120 = 6120 'a ' 'a ' +DROP TABLE t1; +# +# End of 5.5 tests +# +# +# Start of 5.6 tests +# +# +# WL#3664 WEIGHT_STRING +# +SET NAMES utf8mb4 COLLATE uca1400_ai_ci; +select @@collation_connection; +@@collation_connection +utf8mb4_uca1400_ai_ci +CREATE TABLE t1 AS SELECT 'a' AS a; +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `a` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_uca1400_ai_ci NOT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci +CREATE TABLE t2 AS SELECT WEIGHT_STRING(a) AS ws FROM t1; +SHOW CREATE TABLE t2; +Table Create Table +t2 CREATE TABLE `t2` ( + `ws` varbinary(16) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci +SELECT HEX(WEIGHT_STRING(a)) FROM t1; +HEX(WEIGHT_STRING(a)) +2075 +SELECT HEX(ws) FROM t2; +HEX(ws) +2075 +DROP TABLE t2; +DROP TABLE t1; +CREATE TABLE t1 AS SELECT REPEAT('a',5) AS a; +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `a` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_uca1400_ai_ci DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci +CREATE TABLE t2 AS SELECT WEIGHT_STRING(a) AS ws FROM t1; +SHOW CREATE TABLE t2; +Table Create Table +t2 CREATE TABLE `t2` ( + `ws` varbinary(80) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci +SELECT HEX(WEIGHT_STRING(a)) FROM t1; +HEX(WEIGHT_STRING(a)) +20752075207520752075 +SELECT HEX(ws) FROM t2; +HEX(ws) +20752075207520752075 +DROP TABLE t2; +CREATE TABLE t2 AS SELECT WEIGHT_STRING(a AS CHAR(3)) AS ws FROM t1; +SHOW CREATE TABLE t2; +Table Create Table +t2 CREATE TABLE `t2` ( + `ws` varbinary(48) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci +SELECT HEX(WEIGHT_STRING(a AS CHAR(3))) FROM t1; +HEX(WEIGHT_STRING(a AS CHAR(3))) +207520752075 +SELECT HEX(ws) FROM t2; +HEX(ws) +207520752075 +DROP TABLE t2; +CREATE TABLE t2 AS SELECT WEIGHT_STRING(a AS CHAR(10)) AS ws FROM t1; +SHOW CREATE TABLE t2; +Table Create Table +t2 CREATE TABLE `t2` ( + `ws` varbinary(160) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci +SELECT HEX(WEIGHT_STRING(a AS CHAR(10))) FROM t1; +HEX(WEIGHT_STRING(a AS CHAR(10))) +2075207520752075207502090209020902090209 +SELECT HEX(ws) FROM t2; +HEX(ws) +2075207520752075207502090209020902090209 +DROP TABLE t2; +DROP TABLE t1; +select hex(weight_string('a')); +hex(weight_string('a')) +2075 +select hex(weight_string('A')); +hex(weight_string('A')) +2075 +select hex(weight_string('abc')); +hex(weight_string('abc')) +2075208F20A9 +select hex(weight_string('abc' as char(2))); +hex(weight_string('abc' as char(2))) +2075208F +select hex(weight_string('abc' as char(3))); +hex(weight_string('abc' as char(3))) +2075208F20A9 +select hex(weight_string('abc' as char(5))); +hex(weight_string('abc' as char(5))) +2075208F20A902090209 +select hex(weight_string('abc', 1, 2, 0xC0)); +hex(weight_string('abc', 1, 2, 0xC0)) +20 +select hex(weight_string('abc', 2, 2, 0xC0)); +hex(weight_string('abc', 2, 2, 0xC0)) +2075 +select hex(weight_string('abc', 3, 2, 0xC0)); +hex(weight_string('abc', 3, 2, 0xC0)) +207520 +select hex(weight_string('abc', 4, 2, 0xC0)); +hex(weight_string('abc', 4, 2, 0xC0)) +2075208F +select hex(weight_string('abc', 5, 2, 0xC0)); +hex(weight_string('abc', 5, 2, 0xC0)) +2075208F02 +select hex(weight_string('abc',25, 2, 0xC0)); +hex(weight_string('abc',25, 2, 0xC0)) +2075208F020902090209020902090209020902090209020902 +select hex(weight_string('abc', 1, 3, 0xC0)); +hex(weight_string('abc', 1, 3, 0xC0)) +20 +select hex(weight_string('abc', 2, 3, 0xC0)); +hex(weight_string('abc', 2, 3, 0xC0)) +2075 +select hex(weight_string('abc', 3, 3, 0xC0)); +hex(weight_string('abc', 3, 3, 0xC0)) +207520 +select hex(weight_string('abc', 4, 3, 0xC0)); +hex(weight_string('abc', 4, 3, 0xC0)) +2075208F +select hex(weight_string('abc', 5, 3, 0xC0)); +hex(weight_string('abc', 5, 3, 0xC0)) +2075208F20 +select hex(weight_string('abc',25, 3, 0xC0)); +hex(weight_string('abc',25, 3, 0xC0)) +2075208F20A902090209020902090209020902090209020902 +select hex(weight_string('abc', 1, 4, 0xC0)); +hex(weight_string('abc', 1, 4, 0xC0)) +20 +select hex(weight_string('abc', 2, 4, 0xC0)); +hex(weight_string('abc', 2, 4, 0xC0)) +2075 +select hex(weight_string('abc', 3, 4, 0xC0)); +hex(weight_string('abc', 3, 4, 0xC0)) +207520 +select hex(weight_string('abc', 4, 4, 0xC0)); +hex(weight_string('abc', 4, 4, 0xC0)) +2075208F +select hex(weight_string('abc', 5, 4, 0xC0)); +hex(weight_string('abc', 5, 4, 0xC0)) +2075208F20 +select hex(weight_string('abc',25, 4, 0xC0)); +hex(weight_string('abc',25, 4, 0xC0)) +2075208F20A902090209020902090209020902090209020902 +select @@collation_connection; +@@collation_connection +utf8mb4_uca1400_ai_ci +select hex(weight_string(cast(_latin1 0x80 as char))); +hex(weight_string(cast(_latin1 0x80 as char))) +2055 +select hex(weight_string(cast(_latin1 0x808080 as char))); +hex(weight_string(cast(_latin1 0x808080 as char))) +205520552055 +select hex(weight_string(cast(_latin1 0x808080 as char) as char(2))); +hex(weight_string(cast(_latin1 0x808080 as char) as char(2))) +20552055 +select hex(weight_string(cast(_latin1 0x808080 as char) as char(3))); +hex(weight_string(cast(_latin1 0x808080 as char) as char(3))) +205520552055 +select hex(weight_string(cast(_latin1 0x808080 as char) as char(5))); +hex(weight_string(cast(_latin1 0x808080 as char) as char(5))) +20552055205502090209 +select hex(weight_string(cast(_latin1 0x808080 as char), 1, 2, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char), 1, 2, 0xC0)) +20 +select hex(weight_string(cast(_latin1 0x808080 as char), 2, 2, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char), 2, 2, 0xC0)) +2055 +select hex(weight_string(cast(_latin1 0x808080 as char), 3, 2, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char), 3, 2, 0xC0)) +205520 +select hex(weight_string(cast(_latin1 0x808080 as char), 4, 2, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char), 4, 2, 0xC0)) +20552055 +select hex(weight_string(cast(_latin1 0x808080 as char), 5, 2, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char), 5, 2, 0xC0)) +2055205502 +select hex(weight_string(cast(_latin1 0x808080 as char),25, 2, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char),25, 2, 0xC0)) +20552055020902090209020902090209020902090209020902 +select hex(weight_string(cast(_latin1 0x808080 as char), 1, 3, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char), 1, 3, 0xC0)) +20 +select hex(weight_string(cast(_latin1 0x808080 as char), 2, 3, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char), 2, 3, 0xC0)) +2055 +select hex(weight_string(cast(_latin1 0x808080 as char), 3, 3, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char), 3, 3, 0xC0)) +205520 +select hex(weight_string(cast(_latin1 0x808080 as char), 4, 3, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char), 4, 3, 0xC0)) +20552055 +select hex(weight_string(cast(_latin1 0x808080 as char), 5, 3, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char), 5, 3, 0xC0)) +2055205520 +select hex(weight_string(cast(_latin1 0x808080 as char),25, 3, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char),25, 3, 0xC0)) +20552055205502090209020902090209020902090209020902 +select hex(weight_string(cast(_latin1 0x808080 as char), 1, 4, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char), 1, 4, 0xC0)) +20 +select hex(weight_string(cast(_latin1 0x808080 as char), 2, 4, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char), 2, 4, 0xC0)) +2055 +select hex(weight_string(cast(_latin1 0x808080 as char), 3, 4, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char), 3, 4, 0xC0)) +205520 +select hex(weight_string(cast(_latin1 0x808080 as char), 4, 4, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char), 4, 4, 0xC0)) +20552055 +select hex(weight_string(cast(_latin1 0x808080 as char), 5, 4, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char), 5, 4, 0xC0)) +2055205520 +select hex(weight_string(cast(_latin1 0x808080 as char),25, 4, 0xC0)); +hex(weight_string(cast(_latin1 0x808080 as char),25, 4, 0xC0)) +20552055205502090209020902090209020902090209020902 +select @@collation_connection; +@@collation_connection +utf8mb4_uca1400_ai_ci +select hex(weight_string('a' LEVEL 1)); +hex(weight_string('a' LEVEL 1)) +2075 +select hex(weight_string('A' LEVEL 1)); +hex(weight_string('A' LEVEL 1)) +2075 +select hex(weight_string('abc' LEVEL 1)); +hex(weight_string('abc' LEVEL 1)) +2075208F20A9 +select hex(weight_string('abc' as char(2) LEVEL 1)); +hex(weight_string('abc' as char(2) LEVEL 1)) +2075208F +select hex(weight_string('abc' as char(3) LEVEL 1)); +hex(weight_string('abc' as char(3) LEVEL 1)) +2075208F20A9 +select hex(weight_string('abc' as char(5) LEVEL 1)); +hex(weight_string('abc' as char(5) LEVEL 1)) +2075208F20A902090209 +select hex(weight_string('abc' as char(5) LEVEL 1 REVERSE)); +hex(weight_string('abc' as char(5) LEVEL 1 REVERSE)) +09020902A9208F207520 +select hex(weight_string('abc' as char(5) LEVEL 1 DESC)); +hex(weight_string('abc' as char(5) LEVEL 1 DESC)) +DF8ADF70DF56FDF6FDF6 +select hex(weight_string('abc' as char(5) LEVEL 1 DESC REVERSE)); +hex(weight_string('abc' as char(5) LEVEL 1 DESC REVERSE)) +F6FDF6FD56DF70DF8ADF +# +# End of 5.6 tests +# +# +# Start of 10.0 tests +# +SET NAMES utf8mb4 COLLATE uca1400_ai_ci; +# +# Bug#31081 server crash in regexp function +# +drop table if exists t1; +create table t1 as +select repeat(' ', 64) as s1, repeat(' ',64) as s2 +union +select null, null; +show create table t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `s1` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_uca1400_ai_ci DEFAULT NULL, + `s2` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_uca1400_ai_ci DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci +delete from t1; +insert into t1 values('aaa','aaa'); +insert into t1 values('aaa|qqq','qqq'); +insert into t1 values('gheis','^[^a-dXYZ]+$'); +insert into t1 values('aab','^aa?b'); +insert into t1 values('Baaan','^Ba*n'); +insert into t1 values('aaa','qqq|aaa'); +insert into t1 values('qqq','qqq|aaa'); +insert into t1 values('bbb','qqq|aaa'); +insert into t1 values('bbb','qqq'); +insert into t1 values('aaa','aba'); +insert into t1 values(null,'abc'); +insert into t1 values('def',null); +insert into t1 values(null,null); +insert into t1 values('ghi','ghi['); +select HIGH_PRIORITY s1 regexp s2 from t1; +s1 regexp s2 +0 +0 +0 +1 +1 +1 +1 +1 +1 +1 +NULL +NULL +NULL +NULL +drop table t1; +# +# Bug #3928 regexp [[:>:]] and UTF-8 +# +SELECT @@character_set_client, @@collation_connection; +@@character_set_client @@collation_connection +utf8mb4 utf8mb4_uca1400_ai_ci +# This should return TRUE +select 'вася' rlike '\\bвася\\b'; +'вася' rlike '\\bвася\\b' +1 +select 'вася ' rlike '\\bвася\\b'; +'вася ' rlike '\\bвася\\b' +1 +select ' вася' rlike '\\bвася\\b'; +' вася' rlike '\\bвася\\b' +1 +select ' вася ' rlike '\\bвася\\b'; +' вася ' rlike '\\bвася\\b' +1 +select 'вася' rlike '[[:<:]]вася[[:>:]]'; +'вася' rlike '[[:<:]]вася[[:>:]]' +1 +select 'вася ' rlike '[[:<:]]вася[[:>:]]'; +'вася ' rlike '[[:<:]]вася[[:>:]]' +1 +select ' вася' rlike '[[:<:]]вася[[:>:]]'; +' вася' rlike '[[:<:]]вася[[:>:]]' +1 +select ' вася ' rlike '[[:<:]]вася[[:>:]]'; +' вася ' rlike '[[:<:]]вася[[:>:]]' +1 +# This should return FALSE +select 'васяz' rlike '\\bвася\\b'; +'васяz' rlike '\\bвася\\b' +0 +select 'zвася' rlike '\\bвася\\b'; +'zвася' rlike '\\bвася\\b' +0 +select 'zвасяz' rlike '\\bвася\\b'; +'zвасяz' rlike '\\bвася\\b' +0 +select 'васяz' rlike '[[:<:]]вася[[:>:]]'; +'васяz' rlike '[[:<:]]вася[[:>:]]' +0 +select 'zвася' rlike '[[:<:]]вася[[:>:]]'; +'zвася' rlike '[[:<:]]вася[[:>:]]' +0 +select 'zвасяz' rlike '[[:<:]]вася[[:>:]]'; +'zвасяz' rlike '[[:<:]]вася[[:>:]]' +0 +# +# MDEV-7149 Constant condition propagation erroneously applied for LIKE +# +CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS c1 LIMIT 0; +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `c1` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_uca1400_ai_ci DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci +INSERT INTO t1 VALUES ('a'),('a '); +SELECT * FROM t1 WHERE CONCAT(c1)='a'; +c1 +a +a +SELECT * FROM t1 WHERE CONCAT(c1) LIKE 'a '; +c1 +a +SELECT * FROM t1 WHERE CONCAT(c1)='a' AND CONCAT(c1) LIKE 'a '; +c1 +a +EXPLAIN EXTENDED SELECT * FROM t1 WHERE CONCAT(c1)='a' AND CONCAT(c1) LIKE 'a '; +id select_type table type possible_keys key key_len ref rows filtered Extra +1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where +Warnings: +Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where concat(`test`.`t1`.`c1`) = 'a' and concat(`test`.`t1`.`c1`) like 'a ' +DROP TABLE t1; +CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS c1 LIMIT 0; +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `c1` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_uca1400_ai_ci DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci +INSERT INTO t1 VALUES ('a'),('a '); +SELECT * FROM t1 WHERE 'a'=CONCAT(c1); +c1 +a +a +SELECT * FROM t1 WHERE 'a ' LIKE CONCAT(c1); +c1 +a +SELECT * FROM t1 WHERE 'a'=CONCAT(c1) AND 'a ' LIKE CONCAT(c1); +c1 +a +EXPLAIN EXTENDED SELECT * FROM t1 WHERE 'a'=CONCAT(c1) AND 'a ' LIKE CONCAT(c1); +id select_type table type possible_keys key key_len ref rows filtered Extra +1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where +Warnings: +Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where 'a' = concat(`test`.`t1`.`c1`) and 'a ' like concat(`test`.`t1`.`c1`) +DROP TABLE t1; +CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS c1 LIMIT 0; +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `c1` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_uca1400_ai_ci DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci +INSERT INTO t1 VALUES ('%'),('% '); +SELECT * FROM t1 WHERE '% '=CONCAT(c1); +c1 +% +% +SELECT * FROM t1 WHERE 'a' LIKE CONCAT(c1); +c1 +% +SELECT * FROM t1 WHERE '% '=CONCAT(c1) AND 'a' LIKE CONCAT(c1); +c1 +% +EXPLAIN EXTENDED SELECT * FROM t1 WHERE '% '=CONCAT(c1) AND 'a' LIKE CONCAT(c1); +id select_type table type possible_keys key key_len ref rows filtered Extra +1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where +Warnings: +Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where '% ' = concat(`test`.`t1`.`c1`) and 'a' like concat(`test`.`t1`.`c1`) +DROP TABLE t1; +CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS c1 LIMIT 0; +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `c1` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_uca1400_ai_ci DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci +INSERT INTO t1 VALUES ('%'),('% '); +SELECT * FROM t1 WHERE '%'=CONCAT(c1); +c1 +% +% +SELECT * FROM t1 WHERE 'a' LIKE CONCAT(c1); +c1 +% +SELECT * FROM t1 WHERE '%'=CONCAT(c1) AND 'a' LIKE CONCAT(c1); +c1 +% +EXPLAIN EXTENDED SELECT * FROM t1 WHERE '%'=CONCAT(c1) AND 'a' LIKE CONCAT(c1); +id select_type table type possible_keys key key_len ref rows filtered Extra +1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where +Warnings: +Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where '%' = concat(`test`.`t1`.`c1`) and 'a' like concat(`test`.`t1`.`c1`) +DROP TABLE t1; +# +# MDEV-8694 Wrong result for SELECT..WHERE a NOT LIKE 'a ' AND a='a' +# +CREATE TABLE t1 AS SELECT SPACE(10) AS a LIMIT 0; +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `a` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_uca1400_ai_ci DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci +INSERT INTO t1 VALUES ('a'),('a '); +SELECT a, LENGTH(a) FROM t1 WHERE a NOT LIKE 'a '; +a LENGTH(a) +a 1 +SELECT a, LENGTH(a) FROM t1 WHERE a NOT LIKE 'a ' AND a='a'; +a LENGTH(a) +a 1 +EXPLAIN EXTENDED SELECT a, LENGTH(a) FROM t1 WHERE a NOT LIKE 'a ' AND a='a'; +id select_type table type possible_keys key key_len ref rows filtered Extra +1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where +Warnings: +Note 1003 select `test`.`t1`.`a` AS `a`,octet_length(`test`.`t1`.`a`) AS `LENGTH(a)` from `test`.`t1` where `test`.`t1`.`a` not like 'a ' and `test`.`t1`.`a` = 'a' +DROP TABLE t1; +# +# End of MDEV-8694 +# +# +# MDEV-7149 Constant condition propagation erroneously applied for LIKE +# +CREATE TABLE t1 AS SELECT REPEAT('a',10) AS c1 LIMIT 0; +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `c1` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_uca1400_ai_ci DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci +INSERT INTO t1 VALUES ('ae'),('ä'); +SELECT * FROM t1 WHERE c1='ä'; +c1 +ä +SELECT * FROM t1 WHERE c1 LIKE 'ae'; +c1 +ae +SELECT * FROM t1 WHERE c1='ä' AND c1 LIKE 'ae'; +c1 +EXPLAIN EXTENDED SELECT * FROM t1 WHERE c1='ä' AND c1 LIKE 'ae'; +id select_type table type possible_keys key key_len ref rows filtered Extra +1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where +Warnings: +Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where `test`.`t1`.`c1` = 'ä' and `test`.`t1`.`c1` like 'ae' +SELECT * FROM t1 WHERE CONCAT(c1)='ä'; +c1 +ä +SELECT * FROM t1 WHERE CONCAT(c1) LIKE 'ae'; +c1 +ae +SELECT * FROM t1 WHERE CONCAT(c1)='ä' AND CONCAT(c1) LIKE 'ae'; +c1 +EXPLAIN EXTENDED SELECT * FROM t1 WHERE CONCAT(c1)='ä' AND CONCAT(c1) LIKE 'ae'; +id select_type table type possible_keys key key_len ref rows filtered Extra +1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where +Warnings: +Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where concat(`test`.`t1`.`c1`) = 'ä' and concat(`test`.`t1`.`c1`) like 'ae' +DROP TABLE IF EXISTS t1; +# +# End of 10.0 tests +# diff --git a/mysql-test/main/ctype_utf8mb4_uca1400_ai_ci.test b/mysql-test/main/ctype_utf8mb4_uca1400_ai_ci.test new file mode 100644 index 00000000000..862053ed977 --- /dev/null +++ b/mysql-test/main/ctype_utf8mb4_uca1400_ai_ci.test @@ -0,0 +1,52 @@ +--echo # +--echo # Start of 5.5 tests +--echo # + +SET NAMES utf8mb4 COLLATE uca1400_ai_ci; +--source include/ctype_special_chars.inc + +--echo # +--echo # End of 5.5 tests +--echo # + + + +--echo # +--echo # Start of 5.6 tests +--echo # + +--echo # +--echo # WL#3664 WEIGHT_STRING +--echo # + +SET NAMES utf8mb4 COLLATE uca1400_ai_ci; +--source include/weight_string.inc +--source include/weight_string_euro.inc +--source include/weight_string_l1.inc + + +--echo # +--echo # End of 5.6 tests +--echo # + + +--echo # +--echo # Start of 10.0 tests +--echo # + +# +# Testing regexp +# +SET NAMES utf8mb4 COLLATE uca1400_ai_ci; +--source include/ctype_regex.inc +--source include/ctype_regex_utf8.inc + +# +# MDEV-7149 Constant condition propagation erroneously applied for LIKE +# +--source include/ctype_like_cond_propagation.inc +--source include/ctype_like_cond_propagation_utf8_german.inc + +--echo # +--echo # End of 10.0 tests +--echo # diff --git a/mysql-test/main/custom_aggregate_functions.result b/mysql-test/main/custom_aggregate_functions.result index 7f2cde1b6fe..9f7c37d43a8 100644 --- a/mysql-test/main/custom_aggregate_functions.result +++ b/mysql-test/main/custom_aggregate_functions.result @@ -1060,9 +1060,9 @@ CREATE TABLE t1 AS SELECT f1() AS c1, COALESCE(f1()) AS c2, CONCAT(f1()) AS c3; SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` tinytext CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL, - `c2` text CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL, - `c3` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL + `c1` tinytext CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL, + `c2` text CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL, + `c3` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; DROP FUNCTION f1; @@ -1079,9 +1079,9 @@ CREATE TABLE t1 AS SELECT f1() AS c1, COALESCE(f1()) AS c2, CONCAT(f1()) AS c3; SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` text CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL, - `c2` mediumtext CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL, - `c3` mediumtext CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL + `c1` text CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL, + `c2` mediumtext CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL, + `c3` mediumtext CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; DROP FUNCTION f1; @@ -1098,9 +1098,9 @@ CREATE TABLE t1 AS SELECT f1() AS c1, COALESCE(f1()) AS c2, CONCAT(f1()) AS c3; SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` mediumtext CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL, - `c2` longtext CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL, - `c3` longtext CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL + `c1` mediumtext CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL, + `c2` longtext CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL, + `c3` longtext CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; DROP FUNCTION f1; @@ -1117,9 +1117,9 @@ CREATE TABLE t1 AS SELECT f1() AS c1, COALESCE(f1()) AS c2, CONCAT(f1()) AS c3; SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` longtext CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL, - `c2` longtext CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL, - `c3` longtext CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL + `c1` longtext CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL, + `c2` longtext CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL, + `c3` longtext CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; DROP FUNCTION f1; diff --git a/mysql-test/main/ddl_i18n_koi8r.result b/mysql-test/main/ddl_i18n_koi8r.result index bc4ef5ca644..566e1d7f253 100644 --- a/mysql-test/main/ddl_i18n_koi8r.result +++ b/mysql-test/main/ddl_i18n_koi8r.result @@ -53,7 +53,7 @@ koi8r_general_ci binary SELECT COLLATION(c1) FROM v2| COLLATION(c1) -utf8mb3_general_ci +utf8mb3_uca1400_ai_ci SELECT * FROM v3| @@ -104,7 +104,7 @@ koi8r_general_ci binary SELECT COLLATION(c1) FROM v2| COLLATION(c1) -utf8mb3_general_ci +utf8mb3_uca1400_ai_ci SELECT * FROM v3| @@ -160,7 +160,7 @@ koi8r_general_ci binary SELECT COLLATION(c1) FROM v2| COLLATION(c1) -utf8mb3_general_ci +utf8mb3_uca1400_ai_ci SELECT * FROM v3| @@ -441,37 +441,37 @@ CALL p1(@a, @b)| c1 c2 c3 utf8mb3_unicode_ci utf8mb3_unicode_ci utf8mb3_unicode_ci c4 c5 c6 c7 c8 -koi8r_general_ci koi8r_general_ci utf8mb3_general_ci koi8r_general_ci koi8r +koi8r_general_ci koi8r_general_ci utf8mb3_uca1400_ai_ci koi8r_general_ci koi8r SELECT COLLATION(@a) AS ca, COLLATION(@b) cb| ca cb utf8mb3_unicode_ci utf8mb3_unicode_ci CALL p2(@a, @b)| c1 c2 c3 -utf8mb3_general_ci utf8mb3_general_ci utf8mb3_general_ci +utf8mb3_uca1400_ai_ci utf8mb3_uca1400_ai_ci utf8mb3_uca1400_ai_ci c4 c5 c6 c7 c8 -koi8r_general_ci koi8r_general_ci utf8mb3_general_ci koi8r_general_ci koi8r +koi8r_general_ci koi8r_general_ci utf8mb3_uca1400_ai_ci koi8r_general_ci koi8r SELECT COLLATION(@a) AS ca, COLLATION(@b) cb| ca cb -utf8mb3_general_ci utf8mb3_general_ci +utf8mb3_uca1400_ai_ci utf8mb3_uca1400_ai_ci CALL mysqltest2.p3(@a, @b)| c1 c2 c3 utf8mb3_unicode_ci utf8mb3_unicode_ci utf8mb3_unicode_ci c4 c5 c6 c7 c8 -koi8r_general_ci koi8r_general_ci utf8mb3_general_ci koi8r_general_ci koi8r +koi8r_general_ci koi8r_general_ci utf8mb3_uca1400_ai_ci koi8r_general_ci koi8r SELECT COLLATION(@a) AS ca, COLLATION(@b) cb| ca cb utf8mb3_unicode_ci utf8mb3_unicode_ci CALL mysqltest2.p4(@a, @b)| c1 c2 c3 -utf8mb3_general_ci utf8mb3_general_ci utf8mb3_general_ci +utf8mb3_uca1400_ai_ci utf8mb3_uca1400_ai_ci utf8mb3_uca1400_ai_ci c4 c5 c6 c7 c8 -koi8r_general_ci koi8r_general_ci utf8mb3_general_ci koi8r_general_ci koi8r +koi8r_general_ci koi8r_general_ci utf8mb3_uca1400_ai_ci koi8r_general_ci koi8r SELECT COLLATION(@a) AS ca, COLLATION(@b) cb| ca cb -utf8mb3_general_ci utf8mb3_general_ci +utf8mb3_uca1400_ai_ci utf8mb3_uca1400_ai_ci ALTER DATABASE mysqltest1 COLLATE cp866_general_ci| @@ -484,22 +484,22 @@ CALL p1(@a, @b)| c1 c2 c3 utf8mb3_unicode_ci utf8mb3_unicode_ci utf8mb3_unicode_ci c4 c5 c6 c7 c8 -koi8r_general_ci koi8r_general_ci utf8mb3_general_ci koi8r_general_ci koi8r +koi8r_general_ci koi8r_general_ci utf8mb3_uca1400_ai_ci koi8r_general_ci koi8r CALL p2(@a, @b)| c1 c2 c3 -utf8mb3_general_ci utf8mb3_general_ci utf8mb3_general_ci +utf8mb3_uca1400_ai_ci utf8mb3_uca1400_ai_ci utf8mb3_uca1400_ai_ci c4 c5 c6 c7 c8 -koi8r_general_ci koi8r_general_ci utf8mb3_general_ci koi8r_general_ci koi8r +koi8r_general_ci koi8r_general_ci utf8mb3_uca1400_ai_ci koi8r_general_ci koi8r CALL mysqltest2.p3(@a, @b)| c1 c2 c3 utf8mb3_unicode_ci utf8mb3_unicode_ci utf8mb3_unicode_ci c4 c5 c6 c7 c8 -koi8r_general_ci koi8r_general_ci utf8mb3_general_ci koi8r_general_ci koi8r +koi8r_general_ci koi8r_general_ci utf8mb3_uca1400_ai_ci koi8r_general_ci koi8r CALL mysqltest2.p4(@a, @b)| c1 c2 c3 -utf8mb3_general_ci utf8mb3_general_ci utf8mb3_general_ci +utf8mb3_uca1400_ai_ci utf8mb3_uca1400_ai_ci utf8mb3_uca1400_ai_ci c4 c5 c6 c7 c8 -koi8r_general_ci koi8r_general_ci utf8mb3_general_ci koi8r_general_ci koi8r +koi8r_general_ci koi8r_general_ci utf8mb3_uca1400_ai_ci koi8r_general_ci koi8r set names koi8r| @@ -686,37 +686,37 @@ CALL p1(@a, @b)| c1 c2 c3 utf8mb3_unicode_ci utf8mb3_unicode_ci utf8mb3_unicode_ci c4 c5 c6 c7 c8 -koi8r_general_ci koi8r_general_ci utf8mb3_general_ci koi8r_general_ci koi8r +koi8r_general_ci koi8r_general_ci utf8mb3_uca1400_ai_ci koi8r_general_ci koi8r SELECT COLLATION(@a) AS ca, COLLATION(@b) cb| ca cb utf8mb3_unicode_ci utf8mb3_unicode_ci CALL p2(@a, @b)| c1 c2 c3 -utf8mb3_general_ci utf8mb3_general_ci utf8mb3_general_ci +utf8mb3_uca1400_ai_ci utf8mb3_uca1400_ai_ci utf8mb3_uca1400_ai_ci c4 c5 c6 c7 c8 -koi8r_general_ci koi8r_general_ci utf8mb3_general_ci koi8r_general_ci koi8r +koi8r_general_ci koi8r_general_ci utf8mb3_uca1400_ai_ci koi8r_general_ci koi8r SELECT COLLATION(@a) AS ca, COLLATION(@b) cb| ca cb -utf8mb3_general_ci utf8mb3_general_ci +utf8mb3_uca1400_ai_ci utf8mb3_uca1400_ai_ci CALL mysqltest2.p3(@a, @b)| c1 c2 c3 utf8mb3_unicode_ci utf8mb3_unicode_ci utf8mb3_unicode_ci c4 c5 c6 c7 c8 -koi8r_general_ci koi8r_general_ci utf8mb3_general_ci koi8r_general_ci koi8r +koi8r_general_ci koi8r_general_ci utf8mb3_uca1400_ai_ci koi8r_general_ci koi8r SELECT COLLATION(@a) AS ca, COLLATION(@b) cb| ca cb utf8mb3_unicode_ci utf8mb3_unicode_ci CALL mysqltest2.p4(@a, @b)| c1 c2 c3 -utf8mb3_general_ci utf8mb3_general_ci utf8mb3_general_ci +utf8mb3_uca1400_ai_ci utf8mb3_uca1400_ai_ci utf8mb3_uca1400_ai_ci c4 c5 c6 c7 c8 -koi8r_general_ci koi8r_general_ci utf8mb3_general_ci koi8r_general_ci koi8r +koi8r_general_ci koi8r_general_ci utf8mb3_uca1400_ai_ci koi8r_general_ci koi8r SELECT COLLATION(@a) AS ca, COLLATION(@b) cb| ca cb -utf8mb3_general_ci utf8mb3_general_ci +utf8mb3_uca1400_ai_ci utf8mb3_uca1400_ai_ci ---> Dump of mysqltest1 /*!999999\- enable the sandbox mode */ @@ -887,22 +887,22 @@ CALL p1(@a, @b)| c1 c2 c3 utf8mb3_unicode_ci utf8mb3_unicode_ci utf8mb3_unicode_ci c4 c5 c6 c7 c8 -koi8r_general_ci koi8r_general_ci utf8mb3_general_ci koi8r_general_ci koi8r +koi8r_general_ci koi8r_general_ci utf8mb3_uca1400_ai_ci koi8r_general_ci koi8r CALL p2(@a, @b)| c1 c2 c3 -utf8mb3_general_ci utf8mb3_general_ci utf8mb3_general_ci +utf8mb3_uca1400_ai_ci utf8mb3_uca1400_ai_ci utf8mb3_uca1400_ai_ci c4 c5 c6 c7 c8 -koi8r_general_ci koi8r_general_ci utf8mb3_general_ci koi8r_general_ci koi8r +koi8r_general_ci koi8r_general_ci utf8mb3_uca1400_ai_ci koi8r_general_ci koi8r CALL mysqltest2.p3(@a, @b)| c1 c2 c3 utf8mb3_unicode_ci utf8mb3_unicode_ci utf8mb3_unicode_ci c4 c5 c6 c7 c8 -koi8r_general_ci koi8r_general_ci utf8mb3_general_ci koi8r_general_ci koi8r +koi8r_general_ci koi8r_general_ci utf8mb3_uca1400_ai_ci koi8r_general_ci koi8r CALL mysqltest2.p4(@a, @b)| c1 c2 c3 -utf8mb3_general_ci utf8mb3_general_ci utf8mb3_general_ci +utf8mb3_uca1400_ai_ci utf8mb3_uca1400_ai_ci utf8mb3_uca1400_ai_ci c4 c5 c6 c7 c8 -koi8r_general_ci koi8r_general_ci utf8mb3_general_ci koi8r_general_ci koi8r +koi8r_general_ci koi8r_general_ci utf8mb3_uca1400_ai_ci koi8r_general_ci koi8r set names koi8r| @@ -1089,37 +1089,37 @@ CALL p1(@a, @b)| c1 c2 c3 utf8mb3_unicode_ci utf8mb3_unicode_ci utf8mb3_unicode_ci c4 c5 c6 c7 c8 -koi8r_general_ci koi8r_general_ci utf8mb3_general_ci koi8r_general_ci koi8r +koi8r_general_ci koi8r_general_ci utf8mb3_uca1400_ai_ci koi8r_general_ci koi8r SELECT COLLATION(@a) AS ca, COLLATION(@b) cb| ca cb utf8mb3_unicode_ci utf8mb3_unicode_ci CALL p2(@a, @b)| c1 c2 c3 -utf8mb3_general_ci utf8mb3_general_ci utf8mb3_general_ci +utf8mb3_uca1400_ai_ci utf8mb3_uca1400_ai_ci utf8mb3_uca1400_ai_ci c4 c5 c6 c7 c8 -koi8r_general_ci koi8r_general_ci utf8mb3_general_ci koi8r_general_ci koi8r +koi8r_general_ci koi8r_general_ci utf8mb3_uca1400_ai_ci koi8r_general_ci koi8r SELECT COLLATION(@a) AS ca, COLLATION(@b) cb| ca cb -utf8mb3_general_ci utf8mb3_general_ci +utf8mb3_uca1400_ai_ci utf8mb3_uca1400_ai_ci CALL mysqltest2.p3(@a, @b)| c1 c2 c3 utf8mb3_unicode_ci utf8mb3_unicode_ci utf8mb3_unicode_ci c4 c5 c6 c7 c8 -koi8r_general_ci koi8r_general_ci utf8mb3_general_ci koi8r_general_ci koi8r +koi8r_general_ci koi8r_general_ci utf8mb3_uca1400_ai_ci koi8r_general_ci koi8r SELECT COLLATION(@a) AS ca, COLLATION(@b) cb| ca cb utf8mb3_unicode_ci utf8mb3_unicode_ci CALL mysqltest2.p4(@a, @b)| c1 c2 c3 -utf8mb3_general_ci utf8mb3_general_ci utf8mb3_general_ci +utf8mb3_uca1400_ai_ci utf8mb3_uca1400_ai_ci utf8mb3_uca1400_ai_ci c4 c5 c6 c7 c8 -koi8r_general_ci koi8r_general_ci utf8mb3_general_ci koi8r_general_ci koi8r +koi8r_general_ci koi8r_general_ci utf8mb3_uca1400_ai_ci koi8r_general_ci koi8r SELECT COLLATION(@a) AS ca, COLLATION(@b) cb| ca cb -utf8mb3_general_ci utf8mb3_general_ci +utf8mb3_uca1400_ai_ci utf8mb3_uca1400_ai_ci connection default; disconnect con2; disconnect con3; @@ -1404,9 +1404,9 @@ koi8r_general_ci koi8r_general_ci koi8r_general_ci koi8r_general_ci -utf8mb3_general_ci -utf8mb3_general_ci -utf8mb3_general_ci +utf8mb3_uca1400_ai_ci +utf8mb3_uca1400_ai_ci +utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci SELECT @@ -1417,7 +1417,7 @@ COLLATION(@b1) AS cb1, COLLATION(@b2) AS cb2, COLLATION(@b3) AS cb3| ca1 ca2 ca3 cb1 cb2 cb3 -koi8r_general_ci utf8mb3_general_ci koi8r_general_ci koi8r_general_ci utf8mb3_general_ci koi8r_general_ci +koi8r_general_ci utf8mb3_uca1400_ai_ci koi8r_general_ci koi8r_general_ci utf8mb3_uca1400_ai_ci koi8r_general_ci DELETE FROM log| @@ -1435,9 +1435,9 @@ koi8r_general_ci koi8r_general_ci koi8r_general_ci koi8r_general_ci -utf8mb3_general_ci -utf8mb3_general_ci -utf8mb3_general_ci +utf8mb3_uca1400_ai_ci +utf8mb3_uca1400_ai_ci +utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci SELECT @@ -1448,7 +1448,7 @@ COLLATION(@b1) AS cb1, COLLATION(@b2) AS cb2, COLLATION(@b3) AS cb3| ca1 ca2 ca3 cb1 cb2 cb3 -koi8r_general_ci utf8mb3_general_ci koi8r_general_ci koi8r_general_ci utf8mb3_general_ci koi8r_general_ci +koi8r_general_ci utf8mb3_uca1400_ai_ci koi8r_general_ci koi8r_general_ci utf8mb3_uca1400_ai_ci koi8r_general_ci DELETE FROM mysqltest2.log| @@ -1676,9 +1676,9 @@ koi8r_general_ci koi8r_general_ci koi8r_general_ci koi8r_general_ci -utf8mb3_general_ci -utf8mb3_general_ci -utf8mb3_general_ci +utf8mb3_uca1400_ai_ci +utf8mb3_uca1400_ai_ci +utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci SELECT @@ -1689,7 +1689,7 @@ COLLATION(@b1) AS cb1, COLLATION(@b2) AS cb2, COLLATION(@b3) AS cb3| ca1 ca2 ca3 cb1 cb2 cb3 -koi8r_general_ci utf8mb3_general_ci koi8r_general_ci koi8r_general_ci utf8mb3_general_ci koi8r_general_ci +koi8r_general_ci utf8mb3_uca1400_ai_ci koi8r_general_ci koi8r_general_ci utf8mb3_uca1400_ai_ci koi8r_general_ci DELETE FROM log| @@ -1707,9 +1707,9 @@ koi8r_general_ci koi8r_general_ci koi8r_general_ci koi8r_general_ci -utf8mb3_general_ci -utf8mb3_general_ci -utf8mb3_general_ci +utf8mb3_uca1400_ai_ci +utf8mb3_uca1400_ai_ci +utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci SELECT @@ -1720,7 +1720,7 @@ COLLATION(@b1) AS cb1, COLLATION(@b2) AS cb2, COLLATION(@b3) AS cb3| ca1 ca2 ca3 cb1 cb2 cb3 -koi8r_general_ci utf8mb3_general_ci koi8r_general_ci koi8r_general_ci utf8mb3_general_ci koi8r_general_ci +koi8r_general_ci utf8mb3_uca1400_ai_ci koi8r_general_ci koi8r_general_ci utf8mb3_uca1400_ai_ci koi8r_general_ci DELETE FROM mysqltest2.log| @@ -2118,9 +2118,9 @@ koi8r_general_ci koi8r_general_ci koi8r_general_ci koi8r_general_ci -utf8mb3_general_ci -utf8mb3_general_ci -utf8mb3_general_ci +utf8mb3_uca1400_ai_ci +utf8mb3_uca1400_ai_ci +utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci SELECT @@ -2131,7 +2131,7 @@ COLLATION(@b1) AS cb1, COLLATION(@b2) AS cb2, COLLATION(@b3) AS cb3| ca1 ca2 ca3 cb1 cb2 cb3 -koi8r_general_ci utf8mb3_general_ci koi8r_general_ci koi8r_general_ci utf8mb3_general_ci koi8r_general_ci +koi8r_general_ci utf8mb3_uca1400_ai_ci koi8r_general_ci koi8r_general_ci utf8mb3_uca1400_ai_ci koi8r_general_ci DELETE FROM log| @@ -2149,9 +2149,9 @@ koi8r_general_ci koi8r_general_ci koi8r_general_ci koi8r_general_ci -utf8mb3_general_ci -utf8mb3_general_ci -utf8mb3_general_ci +utf8mb3_uca1400_ai_ci +utf8mb3_uca1400_ai_ci +utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci SELECT @@ -2162,7 +2162,7 @@ COLLATION(@b1) AS cb1, COLLATION(@b2) AS cb2, COLLATION(@b3) AS cb3| ca1 ca2 ca3 cb1 cb2 cb3 -koi8r_general_ci utf8mb3_general_ci koi8r_general_ci koi8r_general_ci utf8mb3_general_ci koi8r_general_ci +koi8r_general_ci utf8mb3_uca1400_ai_ci koi8r_general_ci koi8r_general_ci utf8mb3_uca1400_ai_ci koi8r_general_ci DELETE FROM mysqltest2.log| connection default; diff --git a/mysql-test/main/ddl_i18n_utf8.result b/mysql-test/main/ddl_i18n_utf8.result index 9561c914302..cef7d427136 100644 --- a/mysql-test/main/ddl_i18n_utf8.result +++ b/mysql-test/main/ddl_i18n_utf8.result @@ -23,33 +23,33 @@ CREATE VIEW v3 AS SELECT _koi8r' SHOW CREATE VIEW v1| View Create View character_set_client collation_connection -v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select 'тест' AS `c1`,`t1`.`кол` AS `c2` from `t1` utf8mb3 utf8mb3_general_ci +v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select 'тест' AS `c1`,`t1`.`кол` AS `c2` from `t1` utf8mb3 utf8mb3_uca1400_ai_ci SHOW CREATE VIEW v2| View Create View character_set_client collation_connection -v2 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v2` AS select _koi8r'' AS `c1` utf8mb3 utf8mb3_general_ci +v2 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v2` AS select _koi8r'' AS `c1` utf8mb3 utf8mb3_uca1400_ai_ci SHOW CREATE VIEW v3| View Create View character_set_client collation_connection -v3 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v3` AS select _koi8r'' AS `тест` utf8mb3 utf8mb3_general_ci +v3 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v3` AS select _koi8r'' AS `тест` utf8mb3 utf8mb3_uca1400_ai_ci SELECT * FROM INFORMATION_SCHEMA.VIEWS WHERE table_name = 'v1'| TABLE_CATALOG TABLE_SCHEMA TABLE_NAME VIEW_DEFINITION CHECK_OPTION IS_UPDATABLE DEFINER SECURITY_TYPE CHARACTER_SET_CLIENT COLLATION_CONNECTION ALGORITHM -def mysqltest1 v1 select 'тест' AS `c1`,`mysqltest1`.`t1`.`кол` AS `c2` from `mysqltest1`.`t1` NONE YES root@localhost DEFINER utf8mb3 utf8mb3_general_ci UNDEFINED +def mysqltest1 v1 select 'тест' AS `c1`,`mysqltest1`.`t1`.`кол` AS `c2` from `mysqltest1`.`t1` NONE YES root@localhost DEFINER utf8mb3 utf8mb3_uca1400_ai_ci UNDEFINED SELECT * FROM INFORMATION_SCHEMA.VIEWS WHERE table_name = 'v2'| TABLE_CATALOG TABLE_SCHEMA TABLE_NAME VIEW_DEFINITION CHECK_OPTION IS_UPDATABLE DEFINER SECURITY_TYPE CHARACTER_SET_CLIENT COLLATION_CONNECTION ALGORITHM -def mysqltest1 v2 select 'тест' AS `c1` NONE NO root@localhost DEFINER utf8mb3 utf8mb3_general_ci UNDEFINED +def mysqltest1 v2 select 'тест' AS `c1` NONE NO root@localhost DEFINER utf8mb3 utf8mb3_uca1400_ai_ci UNDEFINED SELECT * FROM INFORMATION_SCHEMA.VIEWS WHERE table_name = 'v3'| TABLE_CATALOG TABLE_SCHEMA TABLE_NAME VIEW_DEFINITION CHECK_OPTION IS_UPDATABLE DEFINER SECURITY_TYPE CHARACTER_SET_CLIENT COLLATION_CONNECTION ALGORITHM -def mysqltest1 v3 select 'тест' AS `тест` NONE NO root@localhost DEFINER utf8mb3 utf8mb3_general_ci UNDEFINED +def mysqltest1 v3 select 'тест' AS `тест` NONE NO root@localhost DEFINER utf8mb3 utf8mb3_uca1400_ai_ci UNDEFINED SELECT COLLATION(c1), COLLATION(c2) FROM v1| COLLATION(c1) COLLATION(c2) -utf8mb3_general_ci binary +utf8mb3_uca1400_ai_ci binary SELECT COLLATION(c1) FROM v2| COLLATION(c1) @@ -74,33 +74,33 @@ set names utf8| SHOW CREATE VIEW v1| View Create View character_set_client collation_connection -v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select 'тест' AS `c1`,`t1`.`кол` AS `c2` from `t1` utf8mb3 utf8mb3_general_ci +v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select 'тест' AS `c1`,`t1`.`кол` AS `c2` from `t1` utf8mb3 utf8mb3_uca1400_ai_ci SHOW CREATE VIEW v2| View Create View character_set_client collation_connection -v2 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v2` AS select _koi8r'' AS `c1` utf8mb3 utf8mb3_general_ci +v2 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v2` AS select _koi8r'' AS `c1` utf8mb3 utf8mb3_uca1400_ai_ci SHOW CREATE VIEW v3| View Create View character_set_client collation_connection -v3 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v3` AS select _koi8r'' AS `тест` utf8mb3 utf8mb3_general_ci +v3 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v3` AS select _koi8r'' AS `тест` utf8mb3 utf8mb3_uca1400_ai_ci SELECT * FROM INFORMATION_SCHEMA.VIEWS WHERE table_name = 'v1'| TABLE_CATALOG TABLE_SCHEMA TABLE_NAME VIEW_DEFINITION CHECK_OPTION IS_UPDATABLE DEFINER SECURITY_TYPE CHARACTER_SET_CLIENT COLLATION_CONNECTION ALGORITHM -def mysqltest1 v1 select 'тест' AS `c1`,`mysqltest1`.`t1`.`кол` AS `c2` from `mysqltest1`.`t1` NONE YES root@localhost DEFINER utf8mb3 utf8mb3_general_ci UNDEFINED +def mysqltest1 v1 select 'тест' AS `c1`,`mysqltest1`.`t1`.`кол` AS `c2` from `mysqltest1`.`t1` NONE YES root@localhost DEFINER utf8mb3 utf8mb3_uca1400_ai_ci UNDEFINED SELECT * FROM INFORMATION_SCHEMA.VIEWS WHERE table_name = 'v2'| TABLE_CATALOG TABLE_SCHEMA TABLE_NAME VIEW_DEFINITION CHECK_OPTION IS_UPDATABLE DEFINER SECURITY_TYPE CHARACTER_SET_CLIENT COLLATION_CONNECTION ALGORITHM -def mysqltest1 v2 select 'тест' AS `c1` NONE NO root@localhost DEFINER utf8mb3 utf8mb3_general_ci UNDEFINED +def mysqltest1 v2 select 'тест' AS `c1` NONE NO root@localhost DEFINER utf8mb3 utf8mb3_uca1400_ai_ci UNDEFINED SELECT * FROM INFORMATION_SCHEMA.VIEWS WHERE table_name = 'v3'| TABLE_CATALOG TABLE_SCHEMA TABLE_NAME VIEW_DEFINITION CHECK_OPTION IS_UPDATABLE DEFINER SECURITY_TYPE CHARACTER_SET_CLIENT COLLATION_CONNECTION ALGORITHM -def mysqltest1 v3 select 'тест' AS `тест` NONE NO root@localhost DEFINER utf8mb3 utf8mb3_general_ci UNDEFINED +def mysqltest1 v3 select 'тест' AS `тест` NONE NO root@localhost DEFINER utf8mb3 utf8mb3_uca1400_ai_ci UNDEFINED SELECT COLLATION(c1), COLLATION(c2) FROM v1| COLLATION(c1) COLLATION(c2) -utf8mb3_general_ci binary +utf8mb3_uca1400_ai_ci binary SELECT COLLATION(c1) FROM v2| COLLATION(c1) @@ -130,33 +130,33 @@ set names utf8| SHOW CREATE VIEW v1| View Create View character_set_client collation_connection -v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select 'тест' AS `c1`,`t1`.`кол` AS `c2` from `t1` utf8mb3 utf8mb3_general_ci +v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select 'тест' AS `c1`,`t1`.`кол` AS `c2` from `t1` utf8mb3 utf8mb3_uca1400_ai_ci SHOW CREATE VIEW v2| View Create View character_set_client collation_connection -v2 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v2` AS select _koi8r'' AS `c1` utf8mb3 utf8mb3_general_ci +v2 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v2` AS select _koi8r'' AS `c1` utf8mb3 utf8mb3_uca1400_ai_ci SHOW CREATE VIEW v3| View Create View character_set_client collation_connection -v3 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v3` AS select _koi8r'' AS `тест` utf8mb3 utf8mb3_general_ci +v3 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v3` AS select _koi8r'' AS `тест` utf8mb3 utf8mb3_uca1400_ai_ci SELECT * FROM INFORMATION_SCHEMA.VIEWS WHERE table_name = 'v1'| TABLE_CATALOG TABLE_SCHEMA TABLE_NAME VIEW_DEFINITION CHECK_OPTION IS_UPDATABLE DEFINER SECURITY_TYPE CHARACTER_SET_CLIENT COLLATION_CONNECTION ALGORITHM -def mysqltest1 v1 select 'тест' AS `c1`,`mysqltest1`.`t1`.`кол` AS `c2` from `mysqltest1`.`t1` NONE YES root@localhost DEFINER utf8mb3 utf8mb3_general_ci UNDEFINED +def mysqltest1 v1 select 'тест' AS `c1`,`mysqltest1`.`t1`.`кол` AS `c2` from `mysqltest1`.`t1` NONE YES root@localhost DEFINER utf8mb3 utf8mb3_uca1400_ai_ci UNDEFINED SELECT * FROM INFORMATION_SCHEMA.VIEWS WHERE table_name = 'v2'| TABLE_CATALOG TABLE_SCHEMA TABLE_NAME VIEW_DEFINITION CHECK_OPTION IS_UPDATABLE DEFINER SECURITY_TYPE CHARACTER_SET_CLIENT COLLATION_CONNECTION ALGORITHM -def mysqltest1 v2 select 'тест' AS `c1` NONE NO root@localhost DEFINER utf8mb3 utf8mb3_general_ci UNDEFINED +def mysqltest1 v2 select 'тест' AS `c1` NONE NO root@localhost DEFINER utf8mb3 utf8mb3_uca1400_ai_ci UNDEFINED SELECT * FROM INFORMATION_SCHEMA.VIEWS WHERE table_name = 'v3'| TABLE_CATALOG TABLE_SCHEMA TABLE_NAME VIEW_DEFINITION CHECK_OPTION IS_UPDATABLE DEFINER SECURITY_TYPE CHARACTER_SET_CLIENT COLLATION_CONNECTION ALGORITHM -def mysqltest1 v3 select 'тест' AS `тест` NONE NO root@localhost DEFINER utf8mb3 utf8mb3_general_ci UNDEFINED +def mysqltest1 v3 select 'тест' AS `тест` NONE NO root@localhost DEFINER utf8mb3 utf8mb3_uca1400_ai_ci UNDEFINED SELECT COLLATION(c1), COLLATION(c2) FROM v1| COLLATION(c1) COLLATION(c2) -utf8mb3_general_ci binary +utf8mb3_uca1400_ai_ci binary SELECT COLLATION(c1) FROM v2| COLLATION(c1) @@ -277,7 +277,7 @@ COLLATION(_koi8r ' @@character_set_client AS c8; SET парам1 = 'a'; SET парам2 = 'b'; -END utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci +END utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci SHOW CREATE PROCEDURE p2| Procedure sql_mode Create Procedure character_set_client collation_connection Database Collation @@ -298,7 +298,7 @@ COLLATION(_koi8r ' @@character_set_client AS c8; SET парам1 = 'a'; SET парам2 = 'b'; -END utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci +END utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci SHOW CREATE PROCEDURE mysqltest2.p3| Procedure sql_mode Create Procedure character_set_client collation_connection Database Collation @@ -319,7 +319,7 @@ COLLATION(_koi8r ' @@character_set_client AS c8; SET парам1 = 'a'; SET парам2 = 'b'; -END utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci +END utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci SHOW CREATE PROCEDURE mysqltest2.p4| Procedure sql_mode Create Procedure character_set_client collation_connection Database Collation @@ -340,24 +340,24 @@ COLLATION(_koi8r ' @@character_set_client AS c8; SET парам1 = 'a'; SET парам2 = 'b'; -END utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci +END utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci SHOW PROCEDURE STATUS LIKE 'p1'| Db Name Type Definer Modified Created Security_type Comment character_set_client collation_connection Database Collation -mysqltest1 p1 PROCEDURE root@localhost MODIFIED CREATED DEFINER utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci +mysqltest1 p1 PROCEDURE root@localhost MODIFIED CREATED DEFINER utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci SHOW PROCEDURE STATUS LIKE 'p2'| Db Name Type Definer Modified Created Security_type Comment character_set_client collation_connection Database Collation -mysqltest1 p2 PROCEDURE root@localhost MODIFIED CREATED DEFINER utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci +mysqltest1 p2 PROCEDURE root@localhost MODIFIED CREATED DEFINER utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci SHOW PROCEDURE STATUS LIKE 'p3'| Db Name Type Definer Modified Created Security_type Comment character_set_client collation_connection Database Collation -mysqltest2 p3 PROCEDURE root@localhost MODIFIED CREATED DEFINER utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci +mysqltest2 p3 PROCEDURE root@localhost MODIFIED CREATED DEFINER utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci SHOW PROCEDURE STATUS LIKE 'p4'| Db Name Type Definer Modified Created Security_type Comment character_set_client collation_connection Database Collation -mysqltest2 p4 PROCEDURE root@localhost MODIFIED CREATED DEFINER utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci +mysqltest2 p4 PROCEDURE root@localhost MODIFIED CREATED DEFINER utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci SELECT * FROM INFORMATION_SCHEMA.ROUTINES WHERE routine_name = 'p1'| @@ -376,7 +376,7 @@ COLLATION( 'текст') AS c6, @@character_set_client AS c8; SET парам1 = 'a'; SET парам2 = 'b'; -END NULL NULL SQL NO CONTAINS SQL NULL DEFINER CREATED ALTERED root@localhost utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci +END NULL NULL SQL NO CONTAINS SQL NULL DEFINER CREATED ALTERED root@localhost utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci SELECT * FROM INFORMATION_SCHEMA.ROUTINES WHERE routine_name = 'p2'| SPECIFIC_NAME ROUTINE_CATALOG ROUTINE_SCHEMA ROUTINE_NAME ROUTINE_TYPE DATA_TYPE CHARACTER_MAXIMUM_LENGTH CHARACTER_OCTET_LENGTH NUMERIC_PRECISION NUMERIC_SCALE DATETIME_PRECISION CHARACTER_SET_NAME COLLATION_NAME DTD_IDENTIFIER ROUTINE_BODY ROUTINE_DEFINITION EXTERNAL_NAME EXTERNAL_LANGUAGE PARAMETER_STYLE IS_DETERMINISTIC SQL_DATA_ACCESS SQL_PATH SECURITY_TYPE CREATED LAST_ALTERED SQL_MODE ROUTINE_COMMENT DEFINER CHARACTER_SET_CLIENT COLLATION_CONNECTION DATABASE_COLLATION @@ -394,7 +394,7 @@ COLLATION( 'текст') AS c6, @@character_set_client AS c8; SET парам1 = 'a'; SET парам2 = 'b'; -END NULL NULL SQL NO CONTAINS SQL NULL DEFINER CREATED ALTERED root@localhost utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci +END NULL NULL SQL NO CONTAINS SQL NULL DEFINER CREATED ALTERED root@localhost utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci SELECT * FROM INFORMATION_SCHEMA.ROUTINES WHERE routine_name = 'p3'| SPECIFIC_NAME ROUTINE_CATALOG ROUTINE_SCHEMA ROUTINE_NAME ROUTINE_TYPE DATA_TYPE CHARACTER_MAXIMUM_LENGTH CHARACTER_OCTET_LENGTH NUMERIC_PRECISION NUMERIC_SCALE DATETIME_PRECISION CHARACTER_SET_NAME COLLATION_NAME DTD_IDENTIFIER ROUTINE_BODY ROUTINE_DEFINITION EXTERNAL_NAME EXTERNAL_LANGUAGE PARAMETER_STYLE IS_DETERMINISTIC SQL_DATA_ACCESS SQL_PATH SECURITY_TYPE CREATED LAST_ALTERED SQL_MODE ROUTINE_COMMENT DEFINER CHARACTER_SET_CLIENT COLLATION_CONNECTION DATABASE_COLLATION @@ -412,7 +412,7 @@ COLLATION( 'текст') AS c6, @@character_set_client AS c8; SET парам1 = 'a'; SET парам2 = 'b'; -END NULL NULL SQL NO CONTAINS SQL NULL DEFINER CREATED ALTERED root@localhost utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci +END NULL NULL SQL NO CONTAINS SQL NULL DEFINER CREATED ALTERED root@localhost utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci SELECT * FROM INFORMATION_SCHEMA.ROUTINES WHERE routine_name = 'p4'| SPECIFIC_NAME ROUTINE_CATALOG ROUTINE_SCHEMA ROUTINE_NAME ROUTINE_TYPE DATA_TYPE CHARACTER_MAXIMUM_LENGTH CHARACTER_OCTET_LENGTH NUMERIC_PRECISION NUMERIC_SCALE DATETIME_PRECISION CHARACTER_SET_NAME COLLATION_NAME DTD_IDENTIFIER ROUTINE_BODY ROUTINE_DEFINITION EXTERNAL_NAME EXTERNAL_LANGUAGE PARAMETER_STYLE IS_DETERMINISTIC SQL_DATA_ACCESS SQL_PATH SECURITY_TYPE CREATED LAST_ALTERED SQL_MODE ROUTINE_COMMENT DEFINER CHARACTER_SET_CLIENT COLLATION_CONNECTION DATABASE_COLLATION @@ -430,7 +430,7 @@ COLLATION( 'текст') AS c6, @@character_set_client AS c8; SET парам1 = 'a'; SET парам2 = 'b'; -END NULL NULL SQL NO CONTAINS SQL NULL DEFINER CREATED ALTERED root@localhost utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci +END NULL NULL SQL NO CONTAINS SQL NULL DEFINER CREATED ALTERED root@localhost utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci SET @a = '1'| @@ -441,37 +441,37 @@ CALL p1(@a, @b)| c1 c2 c3 utf8mb3_unicode_ci utf8mb3_unicode_ci utf8mb3_unicode_ci c4 c5 c6 c7 c8 -utf8mb3_general_ci utf8mb3_general_ci koi8r_general_ci utf8mb3_general_ci utf8mb3 +utf8mb3_uca1400_ai_ci utf8mb3_uca1400_ai_ci koi8r_general_ci utf8mb3_uca1400_ai_ci utf8mb3 SELECT COLLATION(@a) AS ca, COLLATION(@b) cb| ca cb utf8mb3_unicode_ci utf8mb3_unicode_ci CALL p2(@a, @b)| c1 c2 c3 -utf8mb3_general_ci utf8mb3_general_ci utf8mb3_general_ci +utf8mb3_uca1400_ai_ci utf8mb3_uca1400_ai_ci utf8mb3_uca1400_ai_ci c4 c5 c6 c7 c8 -utf8mb3_general_ci utf8mb3_general_ci koi8r_general_ci utf8mb3_general_ci utf8mb3 +utf8mb3_uca1400_ai_ci utf8mb3_uca1400_ai_ci koi8r_general_ci utf8mb3_uca1400_ai_ci utf8mb3 SELECT COLLATION(@a) AS ca, COLLATION(@b) cb| ca cb -utf8mb3_general_ci utf8mb3_general_ci +utf8mb3_uca1400_ai_ci utf8mb3_uca1400_ai_ci CALL mysqltest2.p3(@a, @b)| c1 c2 c3 utf8mb3_unicode_ci utf8mb3_unicode_ci utf8mb3_unicode_ci c4 c5 c6 c7 c8 -utf8mb3_general_ci utf8mb3_general_ci koi8r_general_ci utf8mb3_general_ci utf8mb3 +utf8mb3_uca1400_ai_ci utf8mb3_uca1400_ai_ci koi8r_general_ci utf8mb3_uca1400_ai_ci utf8mb3 SELECT COLLATION(@a) AS ca, COLLATION(@b) cb| ca cb utf8mb3_unicode_ci utf8mb3_unicode_ci CALL mysqltest2.p4(@a, @b)| c1 c2 c3 -utf8mb3_general_ci utf8mb3_general_ci utf8mb3_general_ci +utf8mb3_uca1400_ai_ci utf8mb3_uca1400_ai_ci utf8mb3_uca1400_ai_ci c4 c5 c6 c7 c8 -utf8mb3_general_ci utf8mb3_general_ci koi8r_general_ci utf8mb3_general_ci utf8mb3 +utf8mb3_uca1400_ai_ci utf8mb3_uca1400_ai_ci koi8r_general_ci utf8mb3_uca1400_ai_ci utf8mb3 SELECT COLLATION(@a) AS ca, COLLATION(@b) cb| ca cb -utf8mb3_general_ci utf8mb3_general_ci +utf8mb3_uca1400_ai_ci utf8mb3_uca1400_ai_ci ALTER DATABASE mysqltest1 COLLATE cp866_general_ci| @@ -484,22 +484,22 @@ CALL p1(@a, @b)| c1 c2 c3 utf8mb3_unicode_ci utf8mb3_unicode_ci utf8mb3_unicode_ci c4 c5 c6 c7 c8 -utf8mb3_general_ci utf8mb3_general_ci koi8r_general_ci utf8mb3_general_ci utf8mb3 +utf8mb3_uca1400_ai_ci utf8mb3_uca1400_ai_ci koi8r_general_ci utf8mb3_uca1400_ai_ci utf8mb3 CALL p2(@a, @b)| c1 c2 c3 -utf8mb3_general_ci utf8mb3_general_ci utf8mb3_general_ci +utf8mb3_uca1400_ai_ci utf8mb3_uca1400_ai_ci utf8mb3_uca1400_ai_ci c4 c5 c6 c7 c8 -utf8mb3_general_ci utf8mb3_general_ci koi8r_general_ci utf8mb3_general_ci utf8mb3 +utf8mb3_uca1400_ai_ci utf8mb3_uca1400_ai_ci koi8r_general_ci utf8mb3_uca1400_ai_ci utf8mb3 CALL mysqltest2.p3(@a, @b)| c1 c2 c3 utf8mb3_unicode_ci utf8mb3_unicode_ci utf8mb3_unicode_ci c4 c5 c6 c7 c8 -utf8mb3_general_ci utf8mb3_general_ci koi8r_general_ci utf8mb3_general_ci utf8mb3 +utf8mb3_uca1400_ai_ci utf8mb3_uca1400_ai_ci koi8r_general_ci utf8mb3_uca1400_ai_ci utf8mb3 CALL mysqltest2.p4(@a, @b)| c1 c2 c3 -utf8mb3_general_ci utf8mb3_general_ci utf8mb3_general_ci +utf8mb3_uca1400_ai_ci utf8mb3_uca1400_ai_ci utf8mb3_uca1400_ai_ci c4 c5 c6 c7 c8 -utf8mb3_general_ci utf8mb3_general_ci koi8r_general_ci utf8mb3_general_ci utf8mb3 +utf8mb3_uca1400_ai_ci utf8mb3_uca1400_ai_ci koi8r_general_ci utf8mb3_uca1400_ai_ci utf8mb3 set names utf8| @@ -522,7 +522,7 @@ COLLATION(_koi8r ' @@character_set_client AS c8; SET парам1 = 'a'; SET парам2 = 'b'; -END utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci +END utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci SHOW CREATE PROCEDURE p2| Procedure sql_mode Create Procedure character_set_client collation_connection Database Collation @@ -543,7 +543,7 @@ COLLATION(_koi8r ' @@character_set_client AS c8; SET парам1 = 'a'; SET парам2 = 'b'; -END utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci +END utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci SHOW CREATE PROCEDURE mysqltest2.p3| Procedure sql_mode Create Procedure character_set_client collation_connection Database Collation @@ -564,7 +564,7 @@ COLLATION(_koi8r ' @@character_set_client AS c8; SET парам1 = 'a'; SET парам2 = 'b'; -END utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci +END utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci SHOW CREATE PROCEDURE mysqltest2.p4| Procedure sql_mode Create Procedure character_set_client collation_connection Database Collation @@ -585,24 +585,24 @@ COLLATION(_koi8r ' @@character_set_client AS c8; SET парам1 = 'a'; SET парам2 = 'b'; -END utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci +END utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci SHOW PROCEDURE STATUS LIKE 'p1'| Db Name Type Definer Modified Created Security_type Comment character_set_client collation_connection Database Collation -mysqltest1 p1 PROCEDURE root@localhost MODIFIED CREATED DEFINER utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci +mysqltest1 p1 PROCEDURE root@localhost MODIFIED CREATED DEFINER utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci SHOW PROCEDURE STATUS LIKE 'p2'| Db Name Type Definer Modified Created Security_type Comment character_set_client collation_connection Database Collation -mysqltest1 p2 PROCEDURE root@localhost MODIFIED CREATED DEFINER utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci +mysqltest1 p2 PROCEDURE root@localhost MODIFIED CREATED DEFINER utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci SHOW PROCEDURE STATUS LIKE 'p3'| Db Name Type Definer Modified Created Security_type Comment character_set_client collation_connection Database Collation -mysqltest2 p3 PROCEDURE root@localhost MODIFIED CREATED DEFINER utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci +mysqltest2 p3 PROCEDURE root@localhost MODIFIED CREATED DEFINER utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci SHOW PROCEDURE STATUS LIKE 'p4'| Db Name Type Definer Modified Created Security_type Comment character_set_client collation_connection Database Collation -mysqltest2 p4 PROCEDURE root@localhost MODIFIED CREATED DEFINER utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci +mysqltest2 p4 PROCEDURE root@localhost MODIFIED CREATED DEFINER utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci SELECT * FROM INFORMATION_SCHEMA.ROUTINES WHERE routine_name = 'p1'| @@ -621,7 +621,7 @@ COLLATION( 'текст') AS c6, @@character_set_client AS c8; SET парам1 = 'a'; SET парам2 = 'b'; -END NULL NULL SQL NO CONTAINS SQL NULL DEFINER CREATED ALTERED root@localhost utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci +END NULL NULL SQL NO CONTAINS SQL NULL DEFINER CREATED ALTERED root@localhost utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci SELECT * FROM INFORMATION_SCHEMA.ROUTINES WHERE routine_name = 'p2'| SPECIFIC_NAME ROUTINE_CATALOG ROUTINE_SCHEMA ROUTINE_NAME ROUTINE_TYPE DATA_TYPE CHARACTER_MAXIMUM_LENGTH CHARACTER_OCTET_LENGTH NUMERIC_PRECISION NUMERIC_SCALE DATETIME_PRECISION CHARACTER_SET_NAME COLLATION_NAME DTD_IDENTIFIER ROUTINE_BODY ROUTINE_DEFINITION EXTERNAL_NAME EXTERNAL_LANGUAGE PARAMETER_STYLE IS_DETERMINISTIC SQL_DATA_ACCESS SQL_PATH SECURITY_TYPE CREATED LAST_ALTERED SQL_MODE ROUTINE_COMMENT DEFINER CHARACTER_SET_CLIENT COLLATION_CONNECTION DATABASE_COLLATION @@ -639,7 +639,7 @@ COLLATION( 'текст') AS c6, @@character_set_client AS c8; SET парам1 = 'a'; SET парам2 = 'b'; -END NULL NULL SQL NO CONTAINS SQL NULL DEFINER CREATED ALTERED root@localhost utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci +END NULL NULL SQL NO CONTAINS SQL NULL DEFINER CREATED ALTERED root@localhost utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci SELECT * FROM INFORMATION_SCHEMA.ROUTINES WHERE routine_name = 'p3'| SPECIFIC_NAME ROUTINE_CATALOG ROUTINE_SCHEMA ROUTINE_NAME ROUTINE_TYPE DATA_TYPE CHARACTER_MAXIMUM_LENGTH CHARACTER_OCTET_LENGTH NUMERIC_PRECISION NUMERIC_SCALE DATETIME_PRECISION CHARACTER_SET_NAME COLLATION_NAME DTD_IDENTIFIER ROUTINE_BODY ROUTINE_DEFINITION EXTERNAL_NAME EXTERNAL_LANGUAGE PARAMETER_STYLE IS_DETERMINISTIC SQL_DATA_ACCESS SQL_PATH SECURITY_TYPE CREATED LAST_ALTERED SQL_MODE ROUTINE_COMMENT DEFINER CHARACTER_SET_CLIENT COLLATION_CONNECTION DATABASE_COLLATION @@ -657,7 +657,7 @@ COLLATION( 'текст') AS c6, @@character_set_client AS c8; SET парам1 = 'a'; SET парам2 = 'b'; -END NULL NULL SQL NO CONTAINS SQL NULL DEFINER CREATED ALTERED root@localhost utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci +END NULL NULL SQL NO CONTAINS SQL NULL DEFINER CREATED ALTERED root@localhost utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci SELECT * FROM INFORMATION_SCHEMA.ROUTINES WHERE routine_name = 'p4'| SPECIFIC_NAME ROUTINE_CATALOG ROUTINE_SCHEMA ROUTINE_NAME ROUTINE_TYPE DATA_TYPE CHARACTER_MAXIMUM_LENGTH CHARACTER_OCTET_LENGTH NUMERIC_PRECISION NUMERIC_SCALE DATETIME_PRECISION CHARACTER_SET_NAME COLLATION_NAME DTD_IDENTIFIER ROUTINE_BODY ROUTINE_DEFINITION EXTERNAL_NAME EXTERNAL_LANGUAGE PARAMETER_STYLE IS_DETERMINISTIC SQL_DATA_ACCESS SQL_PATH SECURITY_TYPE CREATED LAST_ALTERED SQL_MODE ROUTINE_COMMENT DEFINER CHARACTER_SET_CLIENT COLLATION_CONNECTION DATABASE_COLLATION @@ -675,7 +675,7 @@ COLLATION( 'текст') AS c6, @@character_set_client AS c8; SET парам1 = 'a'; SET парам2 = 'b'; -END NULL NULL SQL NO CONTAINS SQL NULL DEFINER CREATED ALTERED root@localhost utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci +END NULL NULL SQL NO CONTAINS SQL NULL DEFINER CREATED ALTERED root@localhost utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci SET @a = '1'| @@ -686,37 +686,37 @@ CALL p1(@a, @b)| c1 c2 c3 utf8mb3_unicode_ci utf8mb3_unicode_ci utf8mb3_unicode_ci c4 c5 c6 c7 c8 -utf8mb3_general_ci utf8mb3_general_ci koi8r_general_ci utf8mb3_general_ci utf8mb3 +utf8mb3_uca1400_ai_ci utf8mb3_uca1400_ai_ci koi8r_general_ci utf8mb3_uca1400_ai_ci utf8mb3 SELECT COLLATION(@a) AS ca, COLLATION(@b) cb| ca cb utf8mb3_unicode_ci utf8mb3_unicode_ci CALL p2(@a, @b)| c1 c2 c3 -utf8mb3_general_ci utf8mb3_general_ci utf8mb3_general_ci +utf8mb3_uca1400_ai_ci utf8mb3_uca1400_ai_ci utf8mb3_uca1400_ai_ci c4 c5 c6 c7 c8 -utf8mb3_general_ci utf8mb3_general_ci koi8r_general_ci utf8mb3_general_ci utf8mb3 +utf8mb3_uca1400_ai_ci utf8mb3_uca1400_ai_ci koi8r_general_ci utf8mb3_uca1400_ai_ci utf8mb3 SELECT COLLATION(@a) AS ca, COLLATION(@b) cb| ca cb -utf8mb3_general_ci utf8mb3_general_ci +utf8mb3_uca1400_ai_ci utf8mb3_uca1400_ai_ci CALL mysqltest2.p3(@a, @b)| c1 c2 c3 utf8mb3_unicode_ci utf8mb3_unicode_ci utf8mb3_unicode_ci c4 c5 c6 c7 c8 -utf8mb3_general_ci utf8mb3_general_ci koi8r_general_ci utf8mb3_general_ci utf8mb3 +utf8mb3_uca1400_ai_ci utf8mb3_uca1400_ai_ci koi8r_general_ci utf8mb3_uca1400_ai_ci utf8mb3 SELECT COLLATION(@a) AS ca, COLLATION(@b) cb| ca cb utf8mb3_unicode_ci utf8mb3_unicode_ci CALL mysqltest2.p4(@a, @b)| c1 c2 c3 -utf8mb3_general_ci utf8mb3_general_ci utf8mb3_general_ci +utf8mb3_uca1400_ai_ci utf8mb3_uca1400_ai_ci utf8mb3_uca1400_ai_ci c4 c5 c6 c7 c8 -utf8mb3_general_ci utf8mb3_general_ci koi8r_general_ci utf8mb3_general_ci utf8mb3 +utf8mb3_uca1400_ai_ci utf8mb3_uca1400_ai_ci koi8r_general_ci utf8mb3_uca1400_ai_ci utf8mb3 SELECT COLLATION(@a) AS ca, COLLATION(@b) cb| ca cb -utf8mb3_general_ci utf8mb3_general_ci +utf8mb3_uca1400_ai_ci utf8mb3_uca1400_ai_ci ---> Dump of mysqltest1 /*!999999\- enable the sandbox mode */ @@ -732,7 +732,7 @@ ALTER DATABASE `mysqltest1` CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci ; /*!50003 SET @saved_col_connection = @@collation_connection */ ; /*!50003 SET character_set_client = utf8mb3 */ ; /*!50003 SET character_set_results = utf8mb3 */ ; -/*!50003 SET collation_connection = utf8mb3_general_ci */ ; +/*!50003 SET collation_connection = utf8mb3_uca1400_ai_ci */ ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `p1`( INOUT парам1 CHAR(10), @@ -766,7 +766,7 @@ ALTER DATABASE `mysqltest1` CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci ; /*!50003 SET @saved_col_connection = @@collation_connection */ ; /*!50003 SET character_set_client = utf8mb3 */ ; /*!50003 SET character_set_results = utf8mb3 */ ; -/*!50003 SET collation_connection = utf8mb3_general_ci */ ; +/*!50003 SET collation_connection = utf8mb3_uca1400_ai_ci */ ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `p2`( INOUT парам1 CHAR(10) CHARACTER SET utf8, @@ -809,7 +809,7 @@ ALTER DATABASE `mysqltest2` CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci ; /*!50003 SET @saved_col_connection = @@collation_connection */ ; /*!50003 SET character_set_client = utf8mb3 */ ; /*!50003 SET character_set_results = utf8mb3 */ ; -/*!50003 SET collation_connection = utf8mb3_general_ci */ ; +/*!50003 SET collation_connection = utf8mb3_uca1400_ai_ci */ ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `p3`( INOUT парам1 CHAR(10), @@ -843,7 +843,7 @@ ALTER DATABASE `mysqltest2` CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci ; /*!50003 SET @saved_col_connection = @@collation_connection */ ; /*!50003 SET character_set_client = utf8mb3 */ ; /*!50003 SET character_set_results = utf8mb3 */ ; -/*!50003 SET collation_connection = utf8mb3_general_ci */ ; +/*!50003 SET collation_connection = utf8mb3_uca1400_ai_ci */ ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `p4`( INOUT парам1 CHAR(10) CHARACTER SET utf8, @@ -887,22 +887,22 @@ CALL p1(@a, @b)| c1 c2 c3 utf8mb3_unicode_ci utf8mb3_unicode_ci utf8mb3_unicode_ci c4 c5 c6 c7 c8 -utf8mb3_general_ci utf8mb3_general_ci koi8r_general_ci utf8mb3_general_ci utf8mb3 +utf8mb3_uca1400_ai_ci utf8mb3_uca1400_ai_ci koi8r_general_ci utf8mb3_uca1400_ai_ci utf8mb3 CALL p2(@a, @b)| c1 c2 c3 -utf8mb3_general_ci utf8mb3_general_ci utf8mb3_general_ci +utf8mb3_uca1400_ai_ci utf8mb3_uca1400_ai_ci utf8mb3_uca1400_ai_ci c4 c5 c6 c7 c8 -utf8mb3_general_ci utf8mb3_general_ci koi8r_general_ci utf8mb3_general_ci utf8mb3 +utf8mb3_uca1400_ai_ci utf8mb3_uca1400_ai_ci koi8r_general_ci utf8mb3_uca1400_ai_ci utf8mb3 CALL mysqltest2.p3(@a, @b)| c1 c2 c3 utf8mb3_unicode_ci utf8mb3_unicode_ci utf8mb3_unicode_ci c4 c5 c6 c7 c8 -utf8mb3_general_ci utf8mb3_general_ci koi8r_general_ci utf8mb3_general_ci utf8mb3 +utf8mb3_uca1400_ai_ci utf8mb3_uca1400_ai_ci koi8r_general_ci utf8mb3_uca1400_ai_ci utf8mb3 CALL mysqltest2.p4(@a, @b)| c1 c2 c3 -utf8mb3_general_ci utf8mb3_general_ci utf8mb3_general_ci +utf8mb3_uca1400_ai_ci utf8mb3_uca1400_ai_ci utf8mb3_uca1400_ai_ci c4 c5 c6 c7 c8 -utf8mb3_general_ci utf8mb3_general_ci koi8r_general_ci utf8mb3_general_ci utf8mb3 +utf8mb3_uca1400_ai_ci utf8mb3_uca1400_ai_ci koi8r_general_ci utf8mb3_uca1400_ai_ci utf8mb3 set names utf8| @@ -925,7 +925,7 @@ COLLATION(_koi8r ' @@character_set_client AS c8; SET парам1 = 'a'; SET парам2 = 'b'; -END utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci +END utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci SHOW CREATE PROCEDURE p2| Procedure sql_mode Create Procedure character_set_client collation_connection Database Collation @@ -946,7 +946,7 @@ COLLATION(_koi8r ' @@character_set_client AS c8; SET парам1 = 'a'; SET парам2 = 'b'; -END utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci +END utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci SHOW CREATE PROCEDURE mysqltest2.p3| Procedure sql_mode Create Procedure character_set_client collation_connection Database Collation @@ -967,7 +967,7 @@ COLLATION(_koi8r ' @@character_set_client AS c8; SET парам1 = 'a'; SET парам2 = 'b'; -END utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci +END utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci SHOW CREATE PROCEDURE mysqltest2.p4| Procedure sql_mode Create Procedure character_set_client collation_connection Database Collation @@ -988,24 +988,24 @@ COLLATION(_koi8r ' @@character_set_client AS c8; SET парам1 = 'a'; SET парам2 = 'b'; -END utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci +END utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci SHOW PROCEDURE STATUS LIKE 'p1'| Db Name Type Definer Modified Created Security_type Comment character_set_client collation_connection Database Collation -mysqltest1 p1 PROCEDURE root@localhost MODIFIED CREATED DEFINER utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci +mysqltest1 p1 PROCEDURE root@localhost MODIFIED CREATED DEFINER utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci SHOW PROCEDURE STATUS LIKE 'p2'| Db Name Type Definer Modified Created Security_type Comment character_set_client collation_connection Database Collation -mysqltest1 p2 PROCEDURE root@localhost MODIFIED CREATED DEFINER utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci +mysqltest1 p2 PROCEDURE root@localhost MODIFIED CREATED DEFINER utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci SHOW PROCEDURE STATUS LIKE 'p3'| Db Name Type Definer Modified Created Security_type Comment character_set_client collation_connection Database Collation -mysqltest2 p3 PROCEDURE root@localhost MODIFIED CREATED DEFINER utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci +mysqltest2 p3 PROCEDURE root@localhost MODIFIED CREATED DEFINER utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci SHOW PROCEDURE STATUS LIKE 'p4'| Db Name Type Definer Modified Created Security_type Comment character_set_client collation_connection Database Collation -mysqltest2 p4 PROCEDURE root@localhost MODIFIED CREATED DEFINER utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci +mysqltest2 p4 PROCEDURE root@localhost MODIFIED CREATED DEFINER utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci SELECT * FROM INFORMATION_SCHEMA.ROUTINES WHERE routine_name = 'p1'| @@ -1024,7 +1024,7 @@ COLLATION( 'текст') AS c6, @@character_set_client AS c8; SET парам1 = 'a'; SET парам2 = 'b'; -END NULL NULL SQL NO CONTAINS SQL NULL DEFINER CREATED ALTERED root@localhost utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci +END NULL NULL SQL NO CONTAINS SQL NULL DEFINER CREATED ALTERED root@localhost utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci SELECT * FROM INFORMATION_SCHEMA.ROUTINES WHERE routine_name = 'p2'| SPECIFIC_NAME ROUTINE_CATALOG ROUTINE_SCHEMA ROUTINE_NAME ROUTINE_TYPE DATA_TYPE CHARACTER_MAXIMUM_LENGTH CHARACTER_OCTET_LENGTH NUMERIC_PRECISION NUMERIC_SCALE DATETIME_PRECISION CHARACTER_SET_NAME COLLATION_NAME DTD_IDENTIFIER ROUTINE_BODY ROUTINE_DEFINITION EXTERNAL_NAME EXTERNAL_LANGUAGE PARAMETER_STYLE IS_DETERMINISTIC SQL_DATA_ACCESS SQL_PATH SECURITY_TYPE CREATED LAST_ALTERED SQL_MODE ROUTINE_COMMENT DEFINER CHARACTER_SET_CLIENT COLLATION_CONNECTION DATABASE_COLLATION @@ -1042,7 +1042,7 @@ COLLATION( 'текст') AS c6, @@character_set_client AS c8; SET парам1 = 'a'; SET парам2 = 'b'; -END NULL NULL SQL NO CONTAINS SQL NULL DEFINER CREATED ALTERED root@localhost utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci +END NULL NULL SQL NO CONTAINS SQL NULL DEFINER CREATED ALTERED root@localhost utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci SELECT * FROM INFORMATION_SCHEMA.ROUTINES WHERE routine_name = 'p3'| SPECIFIC_NAME ROUTINE_CATALOG ROUTINE_SCHEMA ROUTINE_NAME ROUTINE_TYPE DATA_TYPE CHARACTER_MAXIMUM_LENGTH CHARACTER_OCTET_LENGTH NUMERIC_PRECISION NUMERIC_SCALE DATETIME_PRECISION CHARACTER_SET_NAME COLLATION_NAME DTD_IDENTIFIER ROUTINE_BODY ROUTINE_DEFINITION EXTERNAL_NAME EXTERNAL_LANGUAGE PARAMETER_STYLE IS_DETERMINISTIC SQL_DATA_ACCESS SQL_PATH SECURITY_TYPE CREATED LAST_ALTERED SQL_MODE ROUTINE_COMMENT DEFINER CHARACTER_SET_CLIENT COLLATION_CONNECTION DATABASE_COLLATION @@ -1060,7 +1060,7 @@ COLLATION( 'текст') AS c6, @@character_set_client AS c8; SET парам1 = 'a'; SET парам2 = 'b'; -END NULL NULL SQL NO CONTAINS SQL NULL DEFINER CREATED ALTERED root@localhost utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci +END NULL NULL SQL NO CONTAINS SQL NULL DEFINER CREATED ALTERED root@localhost utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci SELECT * FROM INFORMATION_SCHEMA.ROUTINES WHERE routine_name = 'p4'| SPECIFIC_NAME ROUTINE_CATALOG ROUTINE_SCHEMA ROUTINE_NAME ROUTINE_TYPE DATA_TYPE CHARACTER_MAXIMUM_LENGTH CHARACTER_OCTET_LENGTH NUMERIC_PRECISION NUMERIC_SCALE DATETIME_PRECISION CHARACTER_SET_NAME COLLATION_NAME DTD_IDENTIFIER ROUTINE_BODY ROUTINE_DEFINITION EXTERNAL_NAME EXTERNAL_LANGUAGE PARAMETER_STYLE IS_DETERMINISTIC SQL_DATA_ACCESS SQL_PATH SECURITY_TYPE CREATED LAST_ALTERED SQL_MODE ROUTINE_COMMENT DEFINER CHARACTER_SET_CLIENT COLLATION_CONNECTION DATABASE_COLLATION @@ -1078,7 +1078,7 @@ COLLATION( 'текст') AS c6, @@character_set_client AS c8; SET парам1 = 'a'; SET парам2 = 'b'; -END NULL NULL SQL NO CONTAINS SQL NULL DEFINER CREATED ALTERED root@localhost utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci +END NULL NULL SQL NO CONTAINS SQL NULL DEFINER CREATED ALTERED root@localhost utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci SET @a = '1'| @@ -1089,37 +1089,37 @@ CALL p1(@a, @b)| c1 c2 c3 utf8mb3_unicode_ci utf8mb3_unicode_ci utf8mb3_unicode_ci c4 c5 c6 c7 c8 -utf8mb3_general_ci utf8mb3_general_ci koi8r_general_ci utf8mb3_general_ci utf8mb3 +utf8mb3_uca1400_ai_ci utf8mb3_uca1400_ai_ci koi8r_general_ci utf8mb3_uca1400_ai_ci utf8mb3 SELECT COLLATION(@a) AS ca, COLLATION(@b) cb| ca cb utf8mb3_unicode_ci utf8mb3_unicode_ci CALL p2(@a, @b)| c1 c2 c3 -utf8mb3_general_ci utf8mb3_general_ci utf8mb3_general_ci +utf8mb3_uca1400_ai_ci utf8mb3_uca1400_ai_ci utf8mb3_uca1400_ai_ci c4 c5 c6 c7 c8 -utf8mb3_general_ci utf8mb3_general_ci koi8r_general_ci utf8mb3_general_ci utf8mb3 +utf8mb3_uca1400_ai_ci utf8mb3_uca1400_ai_ci koi8r_general_ci utf8mb3_uca1400_ai_ci utf8mb3 SELECT COLLATION(@a) AS ca, COLLATION(@b) cb| ca cb -utf8mb3_general_ci utf8mb3_general_ci +utf8mb3_uca1400_ai_ci utf8mb3_uca1400_ai_ci CALL mysqltest2.p3(@a, @b)| c1 c2 c3 utf8mb3_unicode_ci utf8mb3_unicode_ci utf8mb3_unicode_ci c4 c5 c6 c7 c8 -utf8mb3_general_ci utf8mb3_general_ci koi8r_general_ci utf8mb3_general_ci utf8mb3 +utf8mb3_uca1400_ai_ci utf8mb3_uca1400_ai_ci koi8r_general_ci utf8mb3_uca1400_ai_ci utf8mb3 SELECT COLLATION(@a) AS ca, COLLATION(@b) cb| ca cb utf8mb3_unicode_ci utf8mb3_unicode_ci CALL mysqltest2.p4(@a, @b)| c1 c2 c3 -utf8mb3_general_ci utf8mb3_general_ci utf8mb3_general_ci +utf8mb3_uca1400_ai_ci utf8mb3_uca1400_ai_ci utf8mb3_uca1400_ai_ci c4 c5 c6 c7 c8 -utf8mb3_general_ci utf8mb3_general_ci koi8r_general_ci utf8mb3_general_ci utf8mb3 +utf8mb3_uca1400_ai_ci utf8mb3_uca1400_ai_ci koi8r_general_ci utf8mb3_uca1400_ai_ci utf8mb3 SELECT COLLATION(@a) AS ca, COLLATION(@b) cb| ca cb -utf8mb3_general_ci utf8mb3_general_ci +utf8mb3_uca1400_ai_ci utf8mb3_uca1400_ai_ci connection default; disconnect con2; disconnect con3; @@ -1213,7 +1213,7 @@ INSERT INTO log VALUES(@@character_set_client); SET @a1 = 'текст'; SET @a2 = _utf8 'текст'; SET @a3 = _koi8r ''; -END utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci # +END utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci # SHOW CREATE TRIGGER trg2| Trigger sql_mode SQL Original Statement character_set_client collation_connection Database Collation Created @@ -1229,7 +1229,7 @@ INSERT INTO log VALUES(@@character_set_client); SET @b1 = 'текст'; SET @b2 = _utf8 'текст'; SET @b3 = _koi8r ''; -END utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci # +END utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci # SHOW CREATE TRIGGER mysqltest2.trg3| Trigger sql_mode SQL Original Statement character_set_client collation_connection Database Collation Created @@ -1245,7 +1245,7 @@ INSERT INTO log VALUES(@@character_set_client); SET @a1 = 'текст'; SET @a2 = _utf8 'текст'; SET @a3 = _koi8r ''; -END utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci # +END utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci # SHOW CREATE TRIGGER mysqltest2.trg4| Trigger sql_mode SQL Original Statement character_set_client collation_connection Database Collation Created @@ -1261,7 +1261,7 @@ INSERT INTO log VALUES(@@character_set_client); SET @b1 = 'текст'; SET @b2 = _utf8 'текст'; SET @b3 = _koi8r ''; -END utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci # +END utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci # SHOW TRIGGERS| @@ -1277,7 +1277,7 @@ INSERT INTO log VALUES(@@character_set_client); SET @a1 = 'текст'; SET @a2 = 'текст'; SET @a3 = 'текст'; -END BEFORE # root@localhost utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci +END BEFORE # root@localhost utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci trg2 INSERT t1 BEGIN DECLARE перем1 CHAR(10) CHARACTER SET utf8; INSERT INTO log VALUES(COLLATION(перем1)); @@ -1289,7 +1289,7 @@ INSERT INTO log VALUES(@@character_set_client); SET @b1 = 'текст'; SET @b2 = 'текст'; SET @b3 = 'текст'; -END AFTER # root@localhost utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci +END AFTER # root@localhost utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci use mysqltest2| @@ -1306,7 +1306,7 @@ INSERT INTO log VALUES(@@character_set_client); SET @a1 = 'текст'; SET @a2 = 'текст'; SET @a3 = 'текст'; -END BEFORE # root@localhost utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci +END BEFORE # root@localhost utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci trg4 INSERT t1 BEGIN DECLARE перем1 CHAR(10) CHARACTER SET utf8; INSERT INTO log VALUES(COLLATION(перем1)); @@ -1318,7 +1318,7 @@ INSERT INTO log VALUES(@@character_set_client); SET @b1 = 'текст'; SET @b2 = 'текст'; SET @b3 = 'текст'; -END AFTER # root@localhost utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci +END AFTER # root@localhost utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci use mysqltest1| @@ -1335,7 +1335,7 @@ INSERT INTO log VALUES(@@character_set_client); SET @a1 = 'текст'; SET @a2 = 'текст'; SET @a3 = 'текст'; -END ROW BEFORE NULL NULL OLD NEW CREATED root@localhost utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci +END ROW BEFORE NULL NULL OLD NEW CREATED root@localhost utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci SELECT * FROM INFORMATION_SCHEMA.TRIGGERS WHERE trigger_name = 'trg2'| TRIGGER_CATALOG TRIGGER_SCHEMA TRIGGER_NAME EVENT_MANIPULATION EVENT_OBJECT_CATALOG EVENT_OBJECT_SCHEMA EVENT_OBJECT_TABLE ACTION_ORDER ACTION_CONDITION ACTION_STATEMENT ACTION_ORIENTATION ACTION_TIMING ACTION_REFERENCE_OLD_TABLE ACTION_REFERENCE_NEW_TABLE ACTION_REFERENCE_OLD_ROW ACTION_REFERENCE_NEW_ROW CREATED SQL_MODE DEFINER CHARACTER_SET_CLIENT COLLATION_CONNECTION DATABASE_COLLATION @@ -1350,7 +1350,7 @@ INSERT INTO log VALUES(@@character_set_client); SET @b1 = 'текст'; SET @b2 = 'текст'; SET @b3 = 'текст'; -END ROW AFTER NULL NULL OLD NEW CREATED root@localhost utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci +END ROW AFTER NULL NULL OLD NEW CREATED root@localhost utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci SELECT * FROM INFORMATION_SCHEMA.TRIGGERS WHERE trigger_name = 'trg3'| TRIGGER_CATALOG TRIGGER_SCHEMA TRIGGER_NAME EVENT_MANIPULATION EVENT_OBJECT_CATALOG EVENT_OBJECT_SCHEMA EVENT_OBJECT_TABLE ACTION_ORDER ACTION_CONDITION ACTION_STATEMENT ACTION_ORIENTATION ACTION_TIMING ACTION_REFERENCE_OLD_TABLE ACTION_REFERENCE_NEW_TABLE ACTION_REFERENCE_OLD_ROW ACTION_REFERENCE_NEW_ROW CREATED SQL_MODE DEFINER CHARACTER_SET_CLIENT COLLATION_CONNECTION DATABASE_COLLATION @@ -1365,7 +1365,7 @@ INSERT INTO log VALUES(@@character_set_client); SET @a1 = 'текст'; SET @a2 = 'текст'; SET @a3 = 'текст'; -END ROW BEFORE NULL NULL OLD NEW CREATED root@localhost utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci +END ROW BEFORE NULL NULL OLD NEW CREATED root@localhost utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci SELECT * FROM INFORMATION_SCHEMA.TRIGGERS WHERE trigger_name = 'trg4'| TRIGGER_CATALOG TRIGGER_SCHEMA TRIGGER_NAME EVENT_MANIPULATION EVENT_OBJECT_CATALOG EVENT_OBJECT_SCHEMA EVENT_OBJECT_TABLE ACTION_ORDER ACTION_CONDITION ACTION_STATEMENT ACTION_ORIENTATION ACTION_TIMING ACTION_REFERENCE_OLD_TABLE ACTION_REFERENCE_NEW_TABLE ACTION_REFERENCE_OLD_ROW ACTION_REFERENCE_NEW_ROW CREATED SQL_MODE DEFINER CHARACTER_SET_CLIENT COLLATION_CONNECTION DATABASE_COLLATION @@ -1380,7 +1380,7 @@ INSERT INTO log VALUES(@@character_set_client); SET @b1 = 'текст'; SET @b2 = 'текст'; SET @b3 = 'текст'; -END ROW AFTER NULL NULL OLD NEW CREATED root@localhost utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci +END ROW AFTER NULL NULL OLD NEW CREATED root@localhost utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci SET @a1 = '1'| @@ -1400,13 +1400,13 @@ koi8r_general_ci koi8r_general_ci utf8mb3 utf8mb3 -utf8mb3_general_ci -utf8mb3_general_ci -utf8mb3_general_ci -utf8mb3_general_ci -utf8mb3_general_ci -utf8mb3_general_ci -utf8mb3_general_ci +utf8mb3_uca1400_ai_ci +utf8mb3_uca1400_ai_ci +utf8mb3_uca1400_ai_ci +utf8mb3_uca1400_ai_ci +utf8mb3_uca1400_ai_ci +utf8mb3_uca1400_ai_ci +utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci SELECT @@ -1417,7 +1417,7 @@ COLLATION(@b1) AS cb1, COLLATION(@b2) AS cb2, COLLATION(@b3) AS cb3| ca1 ca2 ca3 cb1 cb2 cb3 -utf8mb3_general_ci utf8mb3_general_ci koi8r_general_ci utf8mb3_general_ci utf8mb3_general_ci koi8r_general_ci +utf8mb3_uca1400_ai_ci utf8mb3_uca1400_ai_ci koi8r_general_ci utf8mb3_uca1400_ai_ci utf8mb3_uca1400_ai_ci koi8r_general_ci DELETE FROM log| @@ -1431,13 +1431,13 @@ koi8r_general_ci koi8r_general_ci utf8mb3 utf8mb3 -utf8mb3_general_ci -utf8mb3_general_ci -utf8mb3_general_ci -utf8mb3_general_ci -utf8mb3_general_ci -utf8mb3_general_ci -utf8mb3_general_ci +utf8mb3_uca1400_ai_ci +utf8mb3_uca1400_ai_ci +utf8mb3_uca1400_ai_ci +utf8mb3_uca1400_ai_ci +utf8mb3_uca1400_ai_ci +utf8mb3_uca1400_ai_ci +utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci SELECT @@ -1448,7 +1448,7 @@ COLLATION(@b1) AS cb1, COLLATION(@b2) AS cb2, COLLATION(@b3) AS cb3| ca1 ca2 ca3 cb1 cb2 cb3 -utf8mb3_general_ci utf8mb3_general_ci koi8r_general_ci utf8mb3_general_ci utf8mb3_general_ci koi8r_general_ci +utf8mb3_uca1400_ai_ci utf8mb3_uca1400_ai_ci koi8r_general_ci utf8mb3_uca1400_ai_ci utf8mb3_uca1400_ai_ci koi8r_general_ci DELETE FROM mysqltest2.log| @@ -1485,7 +1485,7 @@ INSERT INTO log VALUES(@@character_set_client); SET @a1 = 'текст'; SET @a2 = _utf8 'текст'; SET @a3 = _koi8r ''; -END utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci # +END utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci # SHOW CREATE TRIGGER trg2| Trigger sql_mode SQL Original Statement character_set_client collation_connection Database Collation Created @@ -1501,7 +1501,7 @@ INSERT INTO log VALUES(@@character_set_client); SET @b1 = 'текст'; SET @b2 = _utf8 'текст'; SET @b3 = _koi8r ''; -END utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci # +END utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci # SHOW CREATE TRIGGER mysqltest2.trg3| Trigger sql_mode SQL Original Statement character_set_client collation_connection Database Collation Created @@ -1517,7 +1517,7 @@ INSERT INTO log VALUES(@@character_set_client); SET @a1 = 'текст'; SET @a2 = _utf8 'текст'; SET @a3 = _koi8r ''; -END utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci # +END utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci # SHOW CREATE TRIGGER mysqltest2.trg4| Trigger sql_mode SQL Original Statement character_set_client collation_connection Database Collation Created @@ -1533,7 +1533,7 @@ INSERT INTO log VALUES(@@character_set_client); SET @b1 = 'текст'; SET @b2 = _utf8 'текст'; SET @b3 = _koi8r ''; -END utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci # +END utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci # SHOW TRIGGERS| @@ -1549,7 +1549,7 @@ INSERT INTO log VALUES(@@character_set_client); SET @a1 = 'текст'; SET @a2 = 'текст'; SET @a3 = 'текст'; -END BEFORE # root@localhost utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci +END BEFORE # root@localhost utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci trg2 INSERT t1 BEGIN DECLARE перем1 CHAR(10) CHARACTER SET utf8; INSERT INTO log VALUES(COLLATION(перем1)); @@ -1561,7 +1561,7 @@ INSERT INTO log VALUES(@@character_set_client); SET @b1 = 'текст'; SET @b2 = 'текст'; SET @b3 = 'текст'; -END AFTER # root@localhost utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci +END AFTER # root@localhost utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci use mysqltest2| @@ -1578,7 +1578,7 @@ INSERT INTO log VALUES(@@character_set_client); SET @a1 = 'текст'; SET @a2 = 'текст'; SET @a3 = 'текст'; -END BEFORE # root@localhost utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci +END BEFORE # root@localhost utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci trg4 INSERT t1 BEGIN DECLARE перем1 CHAR(10) CHARACTER SET utf8; INSERT INTO log VALUES(COLLATION(перем1)); @@ -1590,7 +1590,7 @@ INSERT INTO log VALUES(@@character_set_client); SET @b1 = 'текст'; SET @b2 = 'текст'; SET @b3 = 'текст'; -END AFTER # root@localhost utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci +END AFTER # root@localhost utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci use mysqltest1| @@ -1607,7 +1607,7 @@ INSERT INTO log VALUES(@@character_set_client); SET @a1 = 'текст'; SET @a2 = 'текст'; SET @a3 = 'текст'; -END ROW BEFORE NULL NULL OLD NEW CREATED root@localhost utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci +END ROW BEFORE NULL NULL OLD NEW CREATED root@localhost utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci SELECT * FROM INFORMATION_SCHEMA.TRIGGERS WHERE trigger_name = 'trg2'| TRIGGER_CATALOG TRIGGER_SCHEMA TRIGGER_NAME EVENT_MANIPULATION EVENT_OBJECT_CATALOG EVENT_OBJECT_SCHEMA EVENT_OBJECT_TABLE ACTION_ORDER ACTION_CONDITION ACTION_STATEMENT ACTION_ORIENTATION ACTION_TIMING ACTION_REFERENCE_OLD_TABLE ACTION_REFERENCE_NEW_TABLE ACTION_REFERENCE_OLD_ROW ACTION_REFERENCE_NEW_ROW CREATED SQL_MODE DEFINER CHARACTER_SET_CLIENT COLLATION_CONNECTION DATABASE_COLLATION @@ -1622,7 +1622,7 @@ INSERT INTO log VALUES(@@character_set_client); SET @b1 = 'текст'; SET @b2 = 'текст'; SET @b3 = 'текст'; -END ROW AFTER NULL NULL OLD NEW CREATED root@localhost utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci +END ROW AFTER NULL NULL OLD NEW CREATED root@localhost utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci SELECT * FROM INFORMATION_SCHEMA.TRIGGERS WHERE trigger_name = 'trg3'| TRIGGER_CATALOG TRIGGER_SCHEMA TRIGGER_NAME EVENT_MANIPULATION EVENT_OBJECT_CATALOG EVENT_OBJECT_SCHEMA EVENT_OBJECT_TABLE ACTION_ORDER ACTION_CONDITION ACTION_STATEMENT ACTION_ORIENTATION ACTION_TIMING ACTION_REFERENCE_OLD_TABLE ACTION_REFERENCE_NEW_TABLE ACTION_REFERENCE_OLD_ROW ACTION_REFERENCE_NEW_ROW CREATED SQL_MODE DEFINER CHARACTER_SET_CLIENT COLLATION_CONNECTION DATABASE_COLLATION @@ -1637,7 +1637,7 @@ INSERT INTO log VALUES(@@character_set_client); SET @a1 = 'текст'; SET @a2 = 'текст'; SET @a3 = 'текст'; -END ROW BEFORE NULL NULL OLD NEW CREATED root@localhost utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci +END ROW BEFORE NULL NULL OLD NEW CREATED root@localhost utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci SELECT * FROM INFORMATION_SCHEMA.TRIGGERS WHERE trigger_name = 'trg4'| TRIGGER_CATALOG TRIGGER_SCHEMA TRIGGER_NAME EVENT_MANIPULATION EVENT_OBJECT_CATALOG EVENT_OBJECT_SCHEMA EVENT_OBJECT_TABLE ACTION_ORDER ACTION_CONDITION ACTION_STATEMENT ACTION_ORIENTATION ACTION_TIMING ACTION_REFERENCE_OLD_TABLE ACTION_REFERENCE_NEW_TABLE ACTION_REFERENCE_OLD_ROW ACTION_REFERENCE_NEW_ROW CREATED SQL_MODE DEFINER CHARACTER_SET_CLIENT COLLATION_CONNECTION DATABASE_COLLATION @@ -1652,7 +1652,7 @@ INSERT INTO log VALUES(@@character_set_client); SET @b1 = 'текст'; SET @b2 = 'текст'; SET @b3 = 'текст'; -END ROW AFTER NULL NULL OLD NEW CREATED root@localhost utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci +END ROW AFTER NULL NULL OLD NEW CREATED root@localhost utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci SET @a1 = '1'| @@ -1672,13 +1672,13 @@ koi8r_general_ci koi8r_general_ci utf8mb3 utf8mb3 -utf8mb3_general_ci -utf8mb3_general_ci -utf8mb3_general_ci -utf8mb3_general_ci -utf8mb3_general_ci -utf8mb3_general_ci -utf8mb3_general_ci +utf8mb3_uca1400_ai_ci +utf8mb3_uca1400_ai_ci +utf8mb3_uca1400_ai_ci +utf8mb3_uca1400_ai_ci +utf8mb3_uca1400_ai_ci +utf8mb3_uca1400_ai_ci +utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci SELECT @@ -1689,7 +1689,7 @@ COLLATION(@b1) AS cb1, COLLATION(@b2) AS cb2, COLLATION(@b3) AS cb3| ca1 ca2 ca3 cb1 cb2 cb3 -utf8mb3_general_ci utf8mb3_general_ci koi8r_general_ci utf8mb3_general_ci utf8mb3_general_ci koi8r_general_ci +utf8mb3_uca1400_ai_ci utf8mb3_uca1400_ai_ci koi8r_general_ci utf8mb3_uca1400_ai_ci utf8mb3_uca1400_ai_ci koi8r_general_ci DELETE FROM log| @@ -1703,13 +1703,13 @@ koi8r_general_ci koi8r_general_ci utf8mb3 utf8mb3 -utf8mb3_general_ci -utf8mb3_general_ci -utf8mb3_general_ci -utf8mb3_general_ci -utf8mb3_general_ci -utf8mb3_general_ci -utf8mb3_general_ci +utf8mb3_uca1400_ai_ci +utf8mb3_uca1400_ai_ci +utf8mb3_uca1400_ai_ci +utf8mb3_uca1400_ai_ci +utf8mb3_uca1400_ai_ci +utf8mb3_uca1400_ai_ci +utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci SELECT @@ -1720,7 +1720,7 @@ COLLATION(@b1) AS cb1, COLLATION(@b2) AS cb2, COLLATION(@b3) AS cb3| ca1 ca2 ca3 cb1 cb2 cb3 -utf8mb3_general_ci utf8mb3_general_ci koi8r_general_ci utf8mb3_general_ci utf8mb3_general_ci koi8r_general_ci +utf8mb3_uca1400_ai_ci utf8mb3_uca1400_ai_ci koi8r_general_ci utf8mb3_uca1400_ai_ci utf8mb3_uca1400_ai_ci koi8r_general_ci DELETE FROM mysqltest2.log| @@ -1752,7 +1752,7 @@ ALTER DATABASE `mysqltest1` CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci ; /*!50003 SET @saved_col_connection = @@collation_connection */ ; /*!50003 SET character_set_client = utf8mb3 */ ; /*!50003 SET character_set_results = utf8mb3 */ ; -/*!50003 SET collation_connection = utf8mb3_general_ci */ ; +/*!50003 SET collation_connection = utf8mb3_uca1400_ai_ci */ ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; /*!50003 SET sql_mode = '' */ ; DELIMITER ;; @@ -1781,7 +1781,7 @@ ALTER DATABASE `mysqltest1` CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci ; /*!50003 SET @saved_col_connection = @@collation_connection */ ; /*!50003 SET character_set_client = utf8mb3 */ ; /*!50003 SET character_set_results = utf8mb3 */ ; -/*!50003 SET collation_connection = utf8mb3_general_ci */ ; +/*!50003 SET collation_connection = utf8mb3_uca1400_ai_ci */ ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; /*!50003 SET sql_mode = '' */ ; DELIMITER ;; @@ -1835,7 +1835,7 @@ ALTER DATABASE `mysqltest2` CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci ; /*!50003 SET @saved_col_connection = @@collation_connection */ ; /*!50003 SET character_set_client = utf8mb3 */ ; /*!50003 SET character_set_results = utf8mb3 */ ; -/*!50003 SET collation_connection = utf8mb3_general_ci */ ; +/*!50003 SET collation_connection = utf8mb3_uca1400_ai_ci */ ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; /*!50003 SET sql_mode = '' */ ; DELIMITER ;; @@ -1864,7 +1864,7 @@ ALTER DATABASE `mysqltest2` CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci ; /*!50003 SET @saved_col_connection = @@collation_connection */ ; /*!50003 SET character_set_client = utf8mb3 */ ; /*!50003 SET character_set_results = utf8mb3 */ ; -/*!50003 SET collation_connection = utf8mb3_general_ci */ ; +/*!50003 SET collation_connection = utf8mb3_uca1400_ai_ci */ ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; /*!50003 SET sql_mode = '' */ ; DELIMITER ;; @@ -1927,7 +1927,7 @@ INSERT INTO log VALUES(@@character_set_client); SET @a1 = 'текст'; SET @a2 = _utf8 'текст'; SET @a3 = _koi8r ''; -END utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci # +END utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci # SHOW CREATE TRIGGER trg2| Trigger sql_mode SQL Original Statement character_set_client collation_connection Database Collation Created @@ -1943,7 +1943,7 @@ INSERT INTO log VALUES(@@character_set_client); SET @b1 = 'текст'; SET @b2 = _utf8 'текст'; SET @b3 = _koi8r ''; -END utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci # +END utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci # SHOW CREATE TRIGGER mysqltest2.trg3| Trigger sql_mode SQL Original Statement character_set_client collation_connection Database Collation Created @@ -1959,7 +1959,7 @@ INSERT INTO log VALUES(@@character_set_client); SET @a1 = 'текст'; SET @a2 = _utf8 'текст'; SET @a3 = _koi8r ''; -END utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci # +END utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci # SHOW CREATE TRIGGER mysqltest2.trg4| Trigger sql_mode SQL Original Statement character_set_client collation_connection Database Collation Created @@ -1975,7 +1975,7 @@ INSERT INTO log VALUES(@@character_set_client); SET @b1 = 'текст'; SET @b2 = _utf8 'текст'; SET @b3 = _koi8r ''; -END utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci # +END utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci # SHOW TRIGGERS| @@ -1991,7 +1991,7 @@ INSERT INTO log VALUES(@@character_set_client); SET @a1 = 'текст'; SET @a2 = 'текст'; SET @a3 = 'текст'; -END BEFORE # root@localhost utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci +END BEFORE # root@localhost utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci trg2 INSERT t1 BEGIN DECLARE перем1 CHAR(10) CHARACTER SET utf8; INSERT INTO log VALUES(COLLATION(перем1)); @@ -2003,7 +2003,7 @@ INSERT INTO log VALUES(@@character_set_client); SET @b1 = 'текст'; SET @b2 = 'текст'; SET @b3 = 'текст'; -END AFTER # root@localhost utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci +END AFTER # root@localhost utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci use mysqltest2| @@ -2020,7 +2020,7 @@ INSERT INTO log VALUES(@@character_set_client); SET @a1 = 'текст'; SET @a2 = 'текст'; SET @a3 = 'текст'; -END BEFORE # root@localhost utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci +END BEFORE # root@localhost utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci trg4 INSERT t1 BEGIN DECLARE перем1 CHAR(10) CHARACTER SET utf8; INSERT INTO log VALUES(COLLATION(перем1)); @@ -2032,7 +2032,7 @@ INSERT INTO log VALUES(@@character_set_client); SET @b1 = 'текст'; SET @b2 = 'текст'; SET @b3 = 'текст'; -END AFTER # root@localhost utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci +END AFTER # root@localhost utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci use mysqltest1| @@ -2049,7 +2049,7 @@ INSERT INTO log VALUES(@@character_set_client); SET @a1 = 'текст'; SET @a2 = 'текст'; SET @a3 = 'текст'; -END ROW BEFORE NULL NULL OLD NEW CREATED root@localhost utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci +END ROW BEFORE NULL NULL OLD NEW CREATED root@localhost utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci SELECT * FROM INFORMATION_SCHEMA.TRIGGERS WHERE trigger_name = 'trg2'| TRIGGER_CATALOG TRIGGER_SCHEMA TRIGGER_NAME EVENT_MANIPULATION EVENT_OBJECT_CATALOG EVENT_OBJECT_SCHEMA EVENT_OBJECT_TABLE ACTION_ORDER ACTION_CONDITION ACTION_STATEMENT ACTION_ORIENTATION ACTION_TIMING ACTION_REFERENCE_OLD_TABLE ACTION_REFERENCE_NEW_TABLE ACTION_REFERENCE_OLD_ROW ACTION_REFERENCE_NEW_ROW CREATED SQL_MODE DEFINER CHARACTER_SET_CLIENT COLLATION_CONNECTION DATABASE_COLLATION @@ -2064,7 +2064,7 @@ INSERT INTO log VALUES(@@character_set_client); SET @b1 = 'текст'; SET @b2 = 'текст'; SET @b3 = 'текст'; -END ROW AFTER NULL NULL OLD NEW CREATED root@localhost utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci +END ROW AFTER NULL NULL OLD NEW CREATED root@localhost utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci SELECT * FROM INFORMATION_SCHEMA.TRIGGERS WHERE trigger_name = 'trg3'| TRIGGER_CATALOG TRIGGER_SCHEMA TRIGGER_NAME EVENT_MANIPULATION EVENT_OBJECT_CATALOG EVENT_OBJECT_SCHEMA EVENT_OBJECT_TABLE ACTION_ORDER ACTION_CONDITION ACTION_STATEMENT ACTION_ORIENTATION ACTION_TIMING ACTION_REFERENCE_OLD_TABLE ACTION_REFERENCE_NEW_TABLE ACTION_REFERENCE_OLD_ROW ACTION_REFERENCE_NEW_ROW CREATED SQL_MODE DEFINER CHARACTER_SET_CLIENT COLLATION_CONNECTION DATABASE_COLLATION @@ -2079,7 +2079,7 @@ INSERT INTO log VALUES(@@character_set_client); SET @a1 = 'текст'; SET @a2 = 'текст'; SET @a3 = 'текст'; -END ROW BEFORE NULL NULL OLD NEW CREATED root@localhost utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci +END ROW BEFORE NULL NULL OLD NEW CREATED root@localhost utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci SELECT * FROM INFORMATION_SCHEMA.TRIGGERS WHERE trigger_name = 'trg4'| TRIGGER_CATALOG TRIGGER_SCHEMA TRIGGER_NAME EVENT_MANIPULATION EVENT_OBJECT_CATALOG EVENT_OBJECT_SCHEMA EVENT_OBJECT_TABLE ACTION_ORDER ACTION_CONDITION ACTION_STATEMENT ACTION_ORIENTATION ACTION_TIMING ACTION_REFERENCE_OLD_TABLE ACTION_REFERENCE_NEW_TABLE ACTION_REFERENCE_OLD_ROW ACTION_REFERENCE_NEW_ROW CREATED SQL_MODE DEFINER CHARACTER_SET_CLIENT COLLATION_CONNECTION DATABASE_COLLATION @@ -2094,7 +2094,7 @@ INSERT INTO log VALUES(@@character_set_client); SET @b1 = 'текст'; SET @b2 = 'текст'; SET @b3 = 'текст'; -END ROW AFTER NULL NULL OLD NEW CREATED root@localhost utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci +END ROW AFTER NULL NULL OLD NEW CREATED root@localhost utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci SET @a1 = '1'| @@ -2114,13 +2114,13 @@ koi8r_general_ci koi8r_general_ci utf8mb3 utf8mb3 -utf8mb3_general_ci -utf8mb3_general_ci -utf8mb3_general_ci -utf8mb3_general_ci -utf8mb3_general_ci -utf8mb3_general_ci -utf8mb3_general_ci +utf8mb3_uca1400_ai_ci +utf8mb3_uca1400_ai_ci +utf8mb3_uca1400_ai_ci +utf8mb3_uca1400_ai_ci +utf8mb3_uca1400_ai_ci +utf8mb3_uca1400_ai_ci +utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci SELECT @@ -2131,7 +2131,7 @@ COLLATION(@b1) AS cb1, COLLATION(@b2) AS cb2, COLLATION(@b3) AS cb3| ca1 ca2 ca3 cb1 cb2 cb3 -utf8mb3_general_ci utf8mb3_general_ci koi8r_general_ci utf8mb3_general_ci utf8mb3_general_ci koi8r_general_ci +utf8mb3_uca1400_ai_ci utf8mb3_uca1400_ai_ci koi8r_general_ci utf8mb3_uca1400_ai_ci utf8mb3_uca1400_ai_ci koi8r_general_ci DELETE FROM log| @@ -2145,13 +2145,13 @@ koi8r_general_ci koi8r_general_ci utf8mb3 utf8mb3 -utf8mb3_general_ci -utf8mb3_general_ci -utf8mb3_general_ci -utf8mb3_general_ci -utf8mb3_general_ci -utf8mb3_general_ci -utf8mb3_general_ci +utf8mb3_uca1400_ai_ci +utf8mb3_uca1400_ai_ci +utf8mb3_uca1400_ai_ci +utf8mb3_uca1400_ai_ci +utf8mb3_uca1400_ai_ci +utf8mb3_uca1400_ai_ci +utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci SELECT @@ -2162,7 +2162,7 @@ COLLATION(@b1) AS cb1, COLLATION(@b2) AS cb2, COLLATION(@b3) AS cb3| ca1 ca2 ca3 cb1 cb2 cb3 -utf8mb3_general_ci utf8mb3_general_ci koi8r_general_ci utf8mb3_general_ci utf8mb3_general_ci koi8r_general_ci +utf8mb3_uca1400_ai_ci utf8mb3_uca1400_ai_ci koi8r_general_ci utf8mb3_uca1400_ai_ci utf8mb3_uca1400_ai_ci koi8r_general_ci DELETE FROM mysqltest2.log| connection default; @@ -2251,7 +2251,7 @@ COLLATION(_utf8 'текст') AS c3, COLLATION(_koi8r '') AS c4, @@collation_connection AS c5, @@character_set_client AS c6; -END utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci +END utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci SHOW CREATE EVENT ev2| Event sql_mode time_zone Create Event character_set_client collation_connection Database Collation @@ -2264,7 +2264,7 @@ COLLATION(_utf8 'текст') AS c3, COLLATION(_koi8r '') AS c4, @@collation_connection AS c5, @@character_set_client AS c6; -END utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci +END utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci SHOW CREATE EVENT mysqltest2.ev3| Event sql_mode time_zone Create Event character_set_client collation_connection Database Collation @@ -2277,7 +2277,7 @@ COLLATION(_utf8 'текст') AS c3, COLLATION(_koi8r '') AS c4, @@collation_connection AS c5, @@character_set_client AS c6; -END utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci +END utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci SHOW CREATE EVENT mysqltest2.ev3| Event sql_mode time_zone Create Event character_set_client collation_connection Database Collation @@ -2290,16 +2290,16 @@ COLLATION(_utf8 'текст') AS c3, COLLATION(_koi8r '') AS c4, @@collation_connection AS c5, @@character_set_client AS c6; -END utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci +END utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci SHOW EVENTS LIKE 'ev1'| Db Name Definer Time zone Type Execute at Interval value Interval field Starts Ends Status Originator character_set_client collation_connection Database Collation -mysqltest1 ev1 root@localhost SYSTEM ONE TIME 1970-01-02 00:00:00 NULL NULL NULL NULL DISABLED 1 utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci +mysqltest1 ev1 root@localhost SYSTEM ONE TIME 1970-01-02 00:00:00 NULL NULL NULL NULL DISABLED 1 utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci SHOW EVENTS LIKE 'ev2'| Db Name Definer Time zone Type Execute at Interval value Interval field Starts Ends Status Originator character_set_client collation_connection Database Collation -mysqltest1 ev2 root@localhost SYSTEM ONE TIME 1970-01-02 00:00:00 NULL NULL NULL NULL DISABLED 1 utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci +mysqltest1 ev2 root@localhost SYSTEM ONE TIME 1970-01-02 00:00:00 NULL NULL NULL NULL DISABLED 1 utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci SHOW EVENTS LIKE 'ev3'| Db Name Definer Time zone Type Execute at Interval value Interval field Starts Ends Status Originator character_set_client collation_connection Database Collation @@ -2319,7 +2319,7 @@ COLLATION( 'текст') AS c3, COLLATION( 'текст') AS c4, @@collation_connection AS c5, @@character_set_client AS c6; -END ONE TIME 1970-01-02 00:00:00 NULL NULL NULL NULL DISABLED PRESERVE CREATED LAST_ALTERED NULL 1 utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci +END ONE TIME 1970-01-02 00:00:00 NULL NULL NULL NULL DISABLED PRESERVE CREATED LAST_ALTERED NULL 1 utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci SELECT * FROM INFORMATION_SCHEMA.EVENTS WHERE event_name = 'ev2'| EVENT_CATALOG EVENT_SCHEMA EVENT_NAME DEFINER TIME_ZONE EVENT_BODY EVENT_DEFINITION EVENT_TYPE EXECUTE_AT INTERVAL_VALUE INTERVAL_FIELD SQL_MODE STARTS ENDS STATUS ON_COMPLETION CREATED LAST_ALTERED LAST_EXECUTED EVENT_COMMENT ORIGINATOR CHARACTER_SET_CLIENT COLLATION_CONNECTION DATABASE_COLLATION @@ -2332,7 +2332,7 @@ COLLATION( 'текст') AS c3, COLLATION( 'текст') AS c4, @@collation_connection AS c5, @@character_set_client AS c6; -END ONE TIME 1970-01-02 00:00:00 NULL NULL NULL NULL DISABLED PRESERVE CREATED LAST_ALTERED NULL 1 utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci +END ONE TIME 1970-01-02 00:00:00 NULL NULL NULL NULL DISABLED PRESERVE CREATED LAST_ALTERED NULL 1 utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci SELECT * FROM INFORMATION_SCHEMA.EVENTS WHERE event_name = 'ev3'| EVENT_CATALOG EVENT_SCHEMA EVENT_NAME DEFINER TIME_ZONE EVENT_BODY EVENT_DEFINITION EVENT_TYPE EXECUTE_AT INTERVAL_VALUE INTERVAL_FIELD SQL_MODE STARTS ENDS STATUS ON_COMPLETION CREATED LAST_ALTERED LAST_EXECUTED EVENT_COMMENT ORIGINATOR CHARACTER_SET_CLIENT COLLATION_CONNECTION DATABASE_COLLATION @@ -2345,7 +2345,7 @@ COLLATION( 'текст') AS c3, COLLATION( 'текст') AS c4, @@collation_connection AS c5, @@character_set_client AS c6; -END ONE TIME 1970-01-02 00:00:00 NULL NULL NULL NULL DISABLED PRESERVE CREATED LAST_ALTERED NULL 1 utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci +END ONE TIME 1970-01-02 00:00:00 NULL NULL NULL NULL DISABLED PRESERVE CREATED LAST_ALTERED NULL 1 utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci SELECT * FROM INFORMATION_SCHEMA.EVENTS WHERE event_name = 'ev4'| EVENT_CATALOG EVENT_SCHEMA EVENT_NAME DEFINER TIME_ZONE EVENT_BODY EVENT_DEFINITION EVENT_TYPE EXECUTE_AT INTERVAL_VALUE INTERVAL_FIELD SQL_MODE STARTS ENDS STATUS ON_COMPLETION CREATED LAST_ALTERED LAST_EXECUTED EVENT_COMMENT ORIGINATOR CHARACTER_SET_CLIENT COLLATION_CONNECTION DATABASE_COLLATION @@ -2358,7 +2358,7 @@ COLLATION( 'текст') AS c3, COLLATION( 'текст') AS c4, @@collation_connection AS c5, @@character_set_client AS c6; -END ONE TIME 1970-01-02 00:00:00 NULL NULL NULL NULL DISABLED PRESERVE CREATED LAST_ALTERED NULL 1 utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci +END ONE TIME 1970-01-02 00:00:00 NULL NULL NULL NULL DISABLED PRESERVE CREATED LAST_ALTERED NULL 1 utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci ALTER DATABASE mysqltest1 COLLATE cp866_general_ci| @@ -2385,7 +2385,7 @@ COLLATION(_utf8 'текст') AS c3, COLLATION(_koi8r '') AS c4, @@collation_connection AS c5, @@character_set_client AS c6; -END utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci +END utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci SHOW CREATE EVENT ev2| Event sql_mode time_zone Create Event character_set_client collation_connection Database Collation @@ -2398,7 +2398,7 @@ COLLATION(_utf8 'текст') AS c3, COLLATION(_koi8r '') AS c4, @@collation_connection AS c5, @@character_set_client AS c6; -END utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci +END utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci SHOW CREATE EVENT mysqltest2.ev3| Event sql_mode time_zone Create Event character_set_client collation_connection Database Collation @@ -2411,7 +2411,7 @@ COLLATION(_utf8 'текст') AS c3, COLLATION(_koi8r '') AS c4, @@collation_connection AS c5, @@character_set_client AS c6; -END utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci +END utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci SHOW CREATE EVENT mysqltest2.ev3| Event sql_mode time_zone Create Event character_set_client collation_connection Database Collation @@ -2424,16 +2424,16 @@ COLLATION(_utf8 'текст') AS c3, COLLATION(_koi8r '') AS c4, @@collation_connection AS c5, @@character_set_client AS c6; -END utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci +END utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci SHOW EVENTS LIKE 'ev1'| Db Name Definer Time zone Type Execute at Interval value Interval field Starts Ends Status Originator character_set_client collation_connection Database Collation -mysqltest1 ev1 root@localhost SYSTEM ONE TIME 1970-01-02 00:00:00 NULL NULL NULL NULL DISABLED 1 utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci +mysqltest1 ev1 root@localhost SYSTEM ONE TIME 1970-01-02 00:00:00 NULL NULL NULL NULL DISABLED 1 utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci SHOW EVENTS LIKE 'ev2'| Db Name Definer Time zone Type Execute at Interval value Interval field Starts Ends Status Originator character_set_client collation_connection Database Collation -mysqltest1 ev2 root@localhost SYSTEM ONE TIME 1970-01-02 00:00:00 NULL NULL NULL NULL DISABLED 1 utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci +mysqltest1 ev2 root@localhost SYSTEM ONE TIME 1970-01-02 00:00:00 NULL NULL NULL NULL DISABLED 1 utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci SHOW EVENTS LIKE 'ev3'| Db Name Definer Time zone Type Execute at Interval value Interval field Starts Ends Status Originator character_set_client collation_connection Database Collation @@ -2453,7 +2453,7 @@ COLLATION( 'текст') AS c3, COLLATION( 'текст') AS c4, @@collation_connection AS c5, @@character_set_client AS c6; -END ONE TIME 1970-01-02 00:00:00 NULL NULL NULL NULL DISABLED PRESERVE CREATED LAST_ALTERED NULL 1 utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci +END ONE TIME 1970-01-02 00:00:00 NULL NULL NULL NULL DISABLED PRESERVE CREATED LAST_ALTERED NULL 1 utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci SELECT * FROM INFORMATION_SCHEMA.EVENTS WHERE event_name = 'ev2'| EVENT_CATALOG EVENT_SCHEMA EVENT_NAME DEFINER TIME_ZONE EVENT_BODY EVENT_DEFINITION EVENT_TYPE EXECUTE_AT INTERVAL_VALUE INTERVAL_FIELD SQL_MODE STARTS ENDS STATUS ON_COMPLETION CREATED LAST_ALTERED LAST_EXECUTED EVENT_COMMENT ORIGINATOR CHARACTER_SET_CLIENT COLLATION_CONNECTION DATABASE_COLLATION @@ -2466,7 +2466,7 @@ COLLATION( 'текст') AS c3, COLLATION( 'текст') AS c4, @@collation_connection AS c5, @@character_set_client AS c6; -END ONE TIME 1970-01-02 00:00:00 NULL NULL NULL NULL DISABLED PRESERVE CREATED LAST_ALTERED NULL 1 utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci +END ONE TIME 1970-01-02 00:00:00 NULL NULL NULL NULL DISABLED PRESERVE CREATED LAST_ALTERED NULL 1 utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci SELECT * FROM INFORMATION_SCHEMA.EVENTS WHERE event_name = 'ev3'| EVENT_CATALOG EVENT_SCHEMA EVENT_NAME DEFINER TIME_ZONE EVENT_BODY EVENT_DEFINITION EVENT_TYPE EXECUTE_AT INTERVAL_VALUE INTERVAL_FIELD SQL_MODE STARTS ENDS STATUS ON_COMPLETION CREATED LAST_ALTERED LAST_EXECUTED EVENT_COMMENT ORIGINATOR CHARACTER_SET_CLIENT COLLATION_CONNECTION DATABASE_COLLATION @@ -2479,7 +2479,7 @@ COLLATION( 'текст') AS c3, COLLATION( 'текст') AS c4, @@collation_connection AS c5, @@character_set_client AS c6; -END ONE TIME 1970-01-02 00:00:00 NULL NULL NULL NULL DISABLED PRESERVE CREATED LAST_ALTERED NULL 1 utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci +END ONE TIME 1970-01-02 00:00:00 NULL NULL NULL NULL DISABLED PRESERVE CREATED LAST_ALTERED NULL 1 utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci SELECT * FROM INFORMATION_SCHEMA.EVENTS WHERE event_name = 'ev4'| EVENT_CATALOG EVENT_SCHEMA EVENT_NAME DEFINER TIME_ZONE EVENT_BODY EVENT_DEFINITION EVENT_TYPE EXECUTE_AT INTERVAL_VALUE INTERVAL_FIELD SQL_MODE STARTS ENDS STATUS ON_COMPLETION CREATED LAST_ALTERED LAST_EXECUTED EVENT_COMMENT ORIGINATOR CHARACTER_SET_CLIENT COLLATION_CONNECTION DATABASE_COLLATION @@ -2492,7 +2492,7 @@ COLLATION( 'текст') AS c3, COLLATION( 'текст') AS c4, @@collation_connection AS c5, @@character_set_client AS c6; -END ONE TIME 1970-01-02 00:00:00 NULL NULL NULL NULL DISABLED PRESERVE CREATED LAST_ALTERED NULL 1 utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci +END ONE TIME 1970-01-02 00:00:00 NULL NULL NULL NULL DISABLED PRESERVE CREATED LAST_ALTERED NULL 1 utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci ---> Dump of mysqltest1 /*!999999\- enable the sandbox mode */ @@ -2508,7 +2508,7 @@ ALTER DATABASE `mysqltest1` CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci ;; /*!50003 SET @saved_col_connection = @@collation_connection */ ;; /*!50003 SET character_set_client = utf8mb3 */ ;; /*!50003 SET character_set_results = utf8mb3 */ ;; -/*!50003 SET collation_connection = utf8mb3_general_ci */ ;; +/*!50003 SET collation_connection = utf8mb3_uca1400_ai_ci */ ;; /*!50003 SET @saved_sql_mode = @@sql_mode */ ;; /*!50003 SET sql_mode = '' */ ;; /*!50003 SET @saved_time_zone = @@time_zone */ ;; @@ -2536,7 +2536,7 @@ ALTER DATABASE `mysqltest1` CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci ;; /*!50003 SET @saved_col_connection = @@collation_connection */ ;; /*!50003 SET character_set_client = utf8mb3 */ ;; /*!50003 SET character_set_results = utf8mb3 */ ;; -/*!50003 SET collation_connection = utf8mb3_general_ci */ ;; +/*!50003 SET collation_connection = utf8mb3_uca1400_ai_ci */ ;; /*!50003 SET @saved_sql_mode = @@sql_mode */ ;; /*!50003 SET sql_mode = '' */ ;; /*!50003 SET @saved_time_zone = @@time_zone */ ;; @@ -2576,7 +2576,7 @@ ALTER DATABASE `mysqltest2` CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci ;; /*!50003 SET @saved_col_connection = @@collation_connection */ ;; /*!50003 SET character_set_client = utf8mb3 */ ;; /*!50003 SET character_set_results = utf8mb3 */ ;; -/*!50003 SET collation_connection = utf8mb3_general_ci */ ;; +/*!50003 SET collation_connection = utf8mb3_uca1400_ai_ci */ ;; /*!50003 SET @saved_sql_mode = @@sql_mode */ ;; /*!50003 SET sql_mode = '' */ ;; /*!50003 SET @saved_time_zone = @@time_zone */ ;; @@ -2604,7 +2604,7 @@ ALTER DATABASE `mysqltest2` CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci ;; /*!50003 SET @saved_col_connection = @@collation_connection */ ;; /*!50003 SET character_set_client = utf8mb3 */ ;; /*!50003 SET character_set_results = utf8mb3 */ ;; -/*!50003 SET collation_connection = utf8mb3_general_ci */ ;; +/*!50003 SET collation_connection = utf8mb3_uca1400_ai_ci */ ;; /*!50003 SET @saved_sql_mode = @@sql_mode */ ;; /*!50003 SET sql_mode = '' */ ;; /*!50003 SET @saved_time_zone = @@time_zone */ ;; @@ -2659,7 +2659,7 @@ COLLATION(_utf8 'текст') AS c3, COLLATION(_koi8r '') AS c4, @@collation_connection AS c5, @@character_set_client AS c6; -END utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci +END utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci SHOW CREATE EVENT ev2| Event sql_mode time_zone Create Event character_set_client collation_connection Database Collation @@ -2672,7 +2672,7 @@ COLLATION(_utf8 'текст') AS c3, COLLATION(_koi8r '') AS c4, @@collation_connection AS c5, @@character_set_client AS c6; -END utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci +END utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci SHOW CREATE EVENT mysqltest2.ev3| Event sql_mode time_zone Create Event character_set_client collation_connection Database Collation @@ -2685,7 +2685,7 @@ COLLATION(_utf8 'текст') AS c3, COLLATION(_koi8r '') AS c4, @@collation_connection AS c5, @@character_set_client AS c6; -END utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci +END utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci SHOW CREATE EVENT mysqltest2.ev3| Event sql_mode time_zone Create Event character_set_client collation_connection Database Collation @@ -2698,16 +2698,16 @@ COLLATION(_utf8 'текст') AS c3, COLLATION(_koi8r '') AS c4, @@collation_connection AS c5, @@character_set_client AS c6; -END utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci +END utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci SHOW EVENTS LIKE 'ev1'| Db Name Definer Time zone Type Execute at Interval value Interval field Starts Ends Status Originator character_set_client collation_connection Database Collation -mysqltest1 ev1 root@localhost SYSTEM ONE TIME 1970-01-02 00:00:00 NULL NULL NULL NULL DISABLED 1 utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci +mysqltest1 ev1 root@localhost SYSTEM ONE TIME 1970-01-02 00:00:00 NULL NULL NULL NULL DISABLED 1 utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci SHOW EVENTS LIKE 'ev2'| Db Name Definer Time zone Type Execute at Interval value Interval field Starts Ends Status Originator character_set_client collation_connection Database Collation -mysqltest1 ev2 root@localhost SYSTEM ONE TIME 1970-01-02 00:00:00 NULL NULL NULL NULL DISABLED 1 utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci +mysqltest1 ev2 root@localhost SYSTEM ONE TIME 1970-01-02 00:00:00 NULL NULL NULL NULL DISABLED 1 utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci SHOW EVENTS LIKE 'ev3'| Db Name Definer Time zone Type Execute at Interval value Interval field Starts Ends Status Originator character_set_client collation_connection Database Collation @@ -2727,7 +2727,7 @@ COLLATION( 'текст') AS c3, COLLATION( 'текст') AS c4, @@collation_connection AS c5, @@character_set_client AS c6; -END ONE TIME 1970-01-02 00:00:00 NULL NULL NULL NULL DISABLED PRESERVE CREATED LAST_ALTERED NULL 1 utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci +END ONE TIME 1970-01-02 00:00:00 NULL NULL NULL NULL DISABLED PRESERVE CREATED LAST_ALTERED NULL 1 utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci SELECT * FROM INFORMATION_SCHEMA.EVENTS WHERE event_name = 'ev2'| EVENT_CATALOG EVENT_SCHEMA EVENT_NAME DEFINER TIME_ZONE EVENT_BODY EVENT_DEFINITION EVENT_TYPE EXECUTE_AT INTERVAL_VALUE INTERVAL_FIELD SQL_MODE STARTS ENDS STATUS ON_COMPLETION CREATED LAST_ALTERED LAST_EXECUTED EVENT_COMMENT ORIGINATOR CHARACTER_SET_CLIENT COLLATION_CONNECTION DATABASE_COLLATION @@ -2740,7 +2740,7 @@ COLLATION( 'текст') AS c3, COLLATION( 'текст') AS c4, @@collation_connection AS c5, @@character_set_client AS c6; -END ONE TIME 1970-01-02 00:00:00 NULL NULL NULL NULL DISABLED PRESERVE CREATED LAST_ALTERED NULL 1 utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci +END ONE TIME 1970-01-02 00:00:00 NULL NULL NULL NULL DISABLED PRESERVE CREATED LAST_ALTERED NULL 1 utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci SELECT * FROM INFORMATION_SCHEMA.EVENTS WHERE event_name = 'ev3'| EVENT_CATALOG EVENT_SCHEMA EVENT_NAME DEFINER TIME_ZONE EVENT_BODY EVENT_DEFINITION EVENT_TYPE EXECUTE_AT INTERVAL_VALUE INTERVAL_FIELD SQL_MODE STARTS ENDS STATUS ON_COMPLETION CREATED LAST_ALTERED LAST_EXECUTED EVENT_COMMENT ORIGINATOR CHARACTER_SET_CLIENT COLLATION_CONNECTION DATABASE_COLLATION @@ -2753,7 +2753,7 @@ COLLATION( 'текст') AS c3, COLLATION( 'текст') AS c4, @@collation_connection AS c5, @@character_set_client AS c6; -END ONE TIME 1970-01-02 00:00:00 NULL NULL NULL NULL DISABLED PRESERVE CREATED LAST_ALTERED NULL 1 utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci +END ONE TIME 1970-01-02 00:00:00 NULL NULL NULL NULL DISABLED PRESERVE CREATED LAST_ALTERED NULL 1 utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci SELECT * FROM INFORMATION_SCHEMA.EVENTS WHERE event_name = 'ev4'| EVENT_CATALOG EVENT_SCHEMA EVENT_NAME DEFINER TIME_ZONE EVENT_BODY EVENT_DEFINITION EVENT_TYPE EXECUTE_AT INTERVAL_VALUE INTERVAL_FIELD SQL_MODE STARTS ENDS STATUS ON_COMPLETION CREATED LAST_ALTERED LAST_EXECUTED EVENT_COMMENT ORIGINATOR CHARACTER_SET_CLIENT COLLATION_CONNECTION DATABASE_COLLATION @@ -2766,7 +2766,7 @@ COLLATION( 'текст') AS c3, COLLATION( 'текст') AS c4, @@collation_connection AS c5, @@character_set_client AS c6; -END ONE TIME 1970-01-02 00:00:00 NULL NULL NULL NULL DISABLED PRESERVE CREATED LAST_ALTERED NULL 1 utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci +END ONE TIME 1970-01-02 00:00:00 NULL NULL NULL NULL DISABLED PRESERVE CREATED LAST_ALTERED NULL 1 utf8mb3 utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci ------------------------------------------------------------------- DDL statements within stored routine. diff --git a/mysql-test/main/default.result b/mysql-test/main/default.result index 854e04a9071..9e790caf618 100644 --- a/mysql-test/main/default.result +++ b/mysql-test/main/default.result @@ -2230,7 +2230,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` varchar(10) DEFAULT NULL, `b` varchar(10) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT `a`, - `c` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT convert(`a` using utf8mb3), + `c` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT convert(`a` using utf8mb3), `d` varbinary(10) DEFAULT (cast(`a` as char charset binary)) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci INSERT INTO t1 (a) VALUES ('a'); diff --git a/mysql-test/main/dyncol.result b/mysql-test/main/dyncol.result index 64ce60b4e45..993532c324c 100644 --- a/mysql-test/main/dyncol.result +++ b/mysql-test/main/dyncol.result @@ -4,16 +4,16 @@ select hex(COLUMN_CREATE(1, NULL AS char character set utf8)) as exp; exp 000000 -select hex(COLUMN_CREATE(1, "afaf" AS char character set utf8)) as ex; +select hex(COLUMN_CREATE(1, "afaf" AS char character set utf8 collate utf8_general_ci)) as ex; ex 0001000100032161666166 -select hex(COLUMN_CREATE(1, 1212 AS char character set utf8)) as ex; +select hex(COLUMN_CREATE(1, 1212 AS char character set utf8 collate utf8_general_ci)) as ex; ex 0001000100032131323132 -select hex(COLUMN_CREATE(1, 12.12 AS char character set utf8)) as ex; +select hex(COLUMN_CREATE(1, 12.12 AS char character set utf8 collate utf8_general_ci)) as ex; ex 0001000100032131322E3132 -select hex(COLUMN_CREATE(1, 99999999999999999999999999999 AS char character set utf8)) as ex; +select hex(COLUMN_CREATE(1, 99999999999999999999999999999 AS char character set utf8 collate utf8_general_ci)) as ex; ex 000100010003213939393939393939393939393939393939393939393939393939393939 select hex(COLUMN_CREATE(1, NULL AS unsigned int)); @@ -128,7 +128,7 @@ hex(COLUMN_CREATE(1, NULL AS datetime)) select hex(COLUMN_CREATE(1, "2011-04-05 0:45:49.000001" AS datetime)) as ex; ex 00010001000585B60F010010B70000 -select hex(COLUMN_CREATE(1, "afaf" AS char character set utf8, +select hex(COLUMN_CREATE(1, "afaf" AS char character set utf8 collate utf8_general_ci, 2, 1212 AS unsigned int, 3, 1212 AS int, 4, 12.12 AS double, @@ -150,7 +150,7 @@ select hex(COLUMN_CREATE(1, "afaf" AS char character set utf8, id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE NULL NULL NULL NULL NULL NULL NULL NULL No tables used Warnings: -Note 1003 select hex(column_create(1,'afaf' AS char charset utf8mb3 collate utf8mb3_general_ci ,2,1212 AS unsigned int,3,1212 AS int,4,12.12 AS double,4 + 1,12.12 AS decimal,6,'2011-04-05' AS date,7,'- 0:45:49.000001' AS time,8,'2011-04-05 0:45:49.000001' AS datetime)) AS `ex` +Note 1003 select hex(column_create(1,'afaf' AS char charset utf8mb3 collate utf8mb3_uca1400_ai_ci ,2,1212 AS unsigned int,3,1212 AS int,4,12.12 AS double,4 + 1,12.12 AS decimal,6,'2011-04-05' AS date,7,'- 0:45:49.000001' AS time,8,'2011-04-05 0:45:49.000001' AS datetime)) AS `ex` select hex(column_create(1, 0.0 AS decimal)); hex(column_create(1, 0.0 AS decimal)) 000100010004 @@ -354,7 +354,7 @@ select column_get(column_create(1, "1212" AS char charset utf8), 1 as char chars id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE NULL NULL NULL NULL NULL NULL NULL NULL No tables used Warnings: -Note 1003 select column_get(column_create(1,'1212' AS char charset utf8mb3 collate utf8mb3_general_ci ),1 as char charset utf8mb3) AS `ex` +Note 1003 select column_get(column_create(1,'1212' AS char charset utf8mb3 collate utf8mb3_uca1400_ai_ci ),1 as char charset utf8mb3) AS `ex` select column_get(column_create(1, 1212 AS unsigned int), 1 as char charset utf8) as ex; ex 1212 @@ -414,7 +414,7 @@ select column_get(column_create(1, "1212" AS char charset utf8), 1 as char chars id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE NULL NULL NULL NULL NULL NULL NULL NULL No tables used Warnings: -Note 1003 select column_get(column_create(1,'1212' AS char charset utf8mb3 collate utf8mb3_general_ci ),1 as char charset binary) AS `ex` +Note 1003 select column_get(column_create(1,'1212' AS char charset utf8mb3 collate utf8mb3_uca1400_ai_ci ),1 as char charset binary) AS `ex` # # column get real # @@ -1882,7 +1882,7 @@ drop table t1; create view v1 as select column_get(column_add(column_create(1 , 'blue' as char), 2, 'ttt'), 1 as char); show create view v1; View Create View character_set_client collation_connection -v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select column_get(column_add(column_create(1,'blue' AS char charset utf8mb3 collate utf8mb3_general_ci ),2,'ttt'),1 as char charset utf8mb3) AS `Name_exp_1` utf8mb3 utf8mb3_general_ci +v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select column_get(column_add(column_create(1,'blue' AS char charset utf8mb3 collate utf8mb3_uca1400_ai_ci ),2,'ttt'),1 as char charset utf8mb3) AS `Name_exp_1` utf8mb3 utf8mb3_uca1400_ai_ci select * from v1; Name_exp_1 blue diff --git a/mysql-test/main/dyncol.test b/mysql-test/main/dyncol.test index 1343025d5c5..db191441857 100644 --- a/mysql-test/main/dyncol.test +++ b/mysql-test/main/dyncol.test @@ -8,10 +8,10 @@ --echo # column create --echo # select hex(COLUMN_CREATE(1, NULL AS char character set utf8)) as exp; -select hex(COLUMN_CREATE(1, "afaf" AS char character set utf8)) as ex; -select hex(COLUMN_CREATE(1, 1212 AS char character set utf8)) as ex; -select hex(COLUMN_CREATE(1, 12.12 AS char character set utf8)) as ex; -select hex(COLUMN_CREATE(1, 99999999999999999999999999999 AS char character set utf8)) as ex; +select hex(COLUMN_CREATE(1, "afaf" AS char character set utf8 collate utf8_general_ci)) as ex; +select hex(COLUMN_CREATE(1, 1212 AS char character set utf8 collate utf8_general_ci)) as ex; +select hex(COLUMN_CREATE(1, 12.12 AS char character set utf8 collate utf8_general_ci)) as ex; +select hex(COLUMN_CREATE(1, 99999999999999999999999999999 AS char character set utf8 collate utf8_general_ci)) as ex; select hex(COLUMN_CREATE(1, NULL AS unsigned int)); select hex(COLUMN_CREATE(1, 1212 AS unsigned int)); select hex(COLUMN_CREATE(1, 7 AS unsigned int)); @@ -47,8 +47,8 @@ select hex(COLUMN_CREATE(1, "2011-04-05" AS date)); select hex(COLUMN_CREATE(1, NULL AS time)); select hex(COLUMN_CREATE(1, "0:45:49.000001" AS time)); select hex(COLUMN_CREATE(1, NULL AS datetime)); -select hex(COLUMN_CREATE(1, "2011-04-05 0:45:49.000001" AS datetime)) as ex; -select hex(COLUMN_CREATE(1, "afaf" AS char character set utf8, +select hex(COLUMN_CREATE(1, "2011-04-05 0:45:49.000001" AS datetime)) as ex; +select hex(COLUMN_CREATE(1, "afaf" AS char character set utf8 collate utf8_general_ci, 2, 1212 AS unsigned int, 3, 1212 AS int, 4, 12.12 AS double, diff --git a/mysql-test/main/fulltext.result b/mysql-test/main/fulltext.result index 4c879c01cc4..fa0866e8cff 100644 --- a/mysql-test/main/fulltext.result +++ b/mysql-test/main/fulltext.result @@ -362,10 +362,10 @@ INSERT t1 VALUES (" (" , !"),(" !"); SELECT t, collation(t) FROM t1 WHERE MATCH t AGAINST (''); t collation(t) - - utf8mb3_general_ci + - utf8mb3_uca1400_ai_ci SELECT t, collation(t) FROM t1 WHERE MATCH t AGAINST ('*' IN BOOLEAN MODE); t collation(t) - ! utf8mb3_general_ci + ! utf8mb3_uca1400_ai_ci SELECT * FROM t1 WHERE MATCH t AGAINST ('' IN BOOLEAN MODE); t SELECT t, collation(t) FROM t1 WHERE MATCH t AGAINST ('Osnabrck'); @@ -373,12 +373,12 @@ t collation(t) SET NAMES latin1; SELECT t, collation(t) FROM t1 WHERE MATCH t AGAINST ('Osnabrck'); t collation(t) -aus Osnabrck utf8mb3_general_ci +aus Osnabrck utf8mb3_uca1400_ai_ci SELECT t, collation(t) FROM t1 WHERE MATCH t AGAINST ('Osnabrueck'); t collation(t) SELECT t, collation(t),FORMAT(MATCH t AGAINST ('Osnabruck'),6) FROM t1 WHERE MATCH t AGAINST ('Osnabruck'); t collation(t) FORMAT(MATCH t AGAINST ('Osnabruck'),6) -aus Osnabrck utf8mb3_general_ci 1.591140 +aus Osnabrck utf8mb3_uca1400_ai_ci 1.591140 SET STATEMENT sql_mode = 'NO_ENGINE_SUBSTITUTION' FOR alter table t1 modify t varchar(200) collate latin1_german2_ci not null; Warnings: diff --git a/mysql-test/main/func_digest.result b/mysql-test/main/func_digest.result index 0d3b80bd6c8..50e5e5ddcaa 100644 --- a/mysql-test/main/func_digest.result +++ b/mysql-test/main/func_digest.result @@ -1417,7 +1417,7 @@ e25388fde8290dc286a6164fa2d97e551b53498dcbf7bc378eb1f178 SET NAMES utf8; SELECT sha2('1',224); Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr -def sha2('1',224) 253 168 56 Y 0 39 33 +def sha2('1',224) 253 168 56 Y 0 39 192 sha2('1',224) e25388fde8290dc286a6164fa2d97e551b53498dcbf7bc378eb1f178 SET NAMES latin1; diff --git a/mysql-test/main/func_hybrid_type.result b/mysql-test/main/func_hybrid_type.result index 9b56d11a483..908accd9e13 100644 --- a/mysql-test/main/func_hybrid_type.result +++ b/mysql-test/main/func_hybrid_type.result @@ -3145,8 +3145,8 @@ FROM t1; SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( - `c1` varchar(1) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL, - `c2` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL + `c1` varchar(1) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL, + `c2` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SELECT MAX(COALESCE(c1)) AS c1, @@ -3196,9 +3196,9 @@ FROM t1; SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( - `c1` varchar(1) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL, - `c2` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL, - `c3` text CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL + `c1` varchar(1) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL, + `c2` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL, + `c3` text CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SELECT MAX(COALESCE(c1)) AS c1, @@ -3240,7 +3240,7 @@ FROM t1; SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( - `c1` varchar(1) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL + `c1` varchar(1) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SELECT MAX(COALESCE(c1)) AS c1 @@ -3315,8 +3315,8 @@ FROM t1; SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( - `c1` varchar(1) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL, - `c2` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL + `c1` varchar(1) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL, + `c2` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SELECT @c1:=c1 AS c1, @@ -3364,9 +3364,9 @@ FROM t1; SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( - `c1` varchar(1) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL, - `c2` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL, - `c3` text CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL + `c1` varchar(1) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL, + `c2` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL, + `c3` text CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SELECT @c:=c1 AS c1, @@ -3406,7 +3406,7 @@ FROM t1; SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( - `c1` varchar(1) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL + `c1` varchar(1) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SELECT @c:=c1 AS c1 @@ -3492,8 +3492,8 @@ COALESCE(_latin1'aaa',_utf8 0xC39F) AS c2; SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` varchar(3) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL, - `c2` varchar(3) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL + `c1` varchar(3) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci NOT NULL, + `c2` varchar(3) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci NOT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SELECT * FROM t1; c1 c2 diff --git a/mysql-test/main/func_json.result b/mysql-test/main/func_json.result index 2604cc9a4e4..83dc9a4afa5 100644 --- a/mysql-test/main/func_json.result +++ b/mysql-test/main/func_json.result @@ -414,6 +414,24 @@ select json_object('foo', json_unquote(json_object('bar', c)),'qux', c) as fld f fld {"foo": "{\"bar\": \"abc\"}", "qux": "abc"} {"foo": "{\"bar\": \"def\"}", "qux": "def"} +select json_unquote(json_object('bar', c)) as c1 from t1; +c1 +{"bar": "abc"} +{"bar": "def"} +select +collation(json_unquote(json_object('bar', c))) as coll_json_unquote, +coercibility(json_unquote(json_object('bar', c))) as coer_json_unquote, +coercibility('bar') as coer_literal +from t1 limit 1; +coll_json_unquote coer_json_unquote coer_literal +utf8mb3_general_ci 4 5 +create table t2 as select json_object('foo', json_unquote(json_object('bar', c)),'qux', c) as fld from t1 limit 0; +show create table t2; +Table Create Table +t2 CREATE TABLE `t2` ( + `fld` varchar(39) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci +drop table t2; drop table t1; select json_object("a", json_object("b", "abcd")); json_object("a", json_object("b", "abcd")) diff --git a/mysql-test/main/func_json.test b/mysql-test/main/func_json.test index 050e54f2b21..d81d240a35f 100644 --- a/mysql-test/main/func_json.test +++ b/mysql-test/main/func_json.test @@ -178,6 +178,16 @@ create table t1 (c VARCHAR(8)) DEFAULT CHARSET=latin1; insert into t1 values ('abc'),('def'); select json_object('foo', json_unquote(json_object('bar', c)),'qux', c) as fld from t1; +select json_unquote(json_object('bar', c)) as c1 from t1; +select + collation(json_unquote(json_object('bar', c))) as coll_json_unquote, + coercibility(json_unquote(json_object('bar', c))) as coer_json_unquote, + coercibility('bar') as coer_literal +from t1 limit 1; + +create table t2 as select json_object('foo', json_unquote(json_object('bar', c)),'qux', c) as fld from t1 limit 0; +show create table t2; +drop table t2; drop table t1; diff --git a/mysql-test/main/func_regexp.result b/mysql-test/main/func_regexp.result index 7a9e24f8262..6c2aed214ba 100644 --- a/mysql-test/main/func_regexp.result +++ b/mysql-test/main/func_regexp.result @@ -1,5 +1,8 @@ drop table if exists t1; set names latin1; +# +# Bug#31081 server crash in regexp function +# drop table if exists t1; create table t1 as select repeat(' ', 64) as s1, repeat(' ',64) as s2 diff --git a/mysql-test/main/func_regexp_pcre.result b/mysql-test/main/func_regexp_pcre.result index 1f25f03db73..7378aafa71a 100644 --- a/mysql-test/main/func_regexp_pcre.result +++ b/mysql-test/main/func_regexp_pcre.result @@ -62,7 +62,7 @@ INSERT INTO t2 VALUES ('\\p{Han}'),('\\p{Hangul}'); INSERT INTO t2 VALUES ('\\p{Sinhala}'), ('\\p{Tamil}'); INSERT INTO t2 VALUES ('\\p{L}'),('\\p{Ll}'),('\\p{Lu}'),('\\p{L&}'); INSERT INTO t2 VALUES ('[[:alpha:]]'),('[[:digit:]]'); -SELECT class, ch, ch RLIKE class FROM t1, t2 ORDER BY class, BINARY ch; +SELECT class, ch, ch RLIKE class FROM t1, t2 ORDER BY BINARY class, BINARY ch; class ch ch RLIKE class [[:alpha:]] 1 0 [[:alpha:]] A 1 @@ -436,7 +436,7 @@ CREATE TABLE t1 AS SELECT REGEXP_REPLACE('abc','b','x'); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `REGEXP_REPLACE('abc','b','x')` longtext CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL + `REGEXP_REPLACE('abc','b','x')` longtext CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; EXPLAIN EXTENDED SELECT REGEXP_REPLACE('abc','b','x'); @@ -739,7 +739,7 @@ CREATE TABLE t1 AS SELECT REGEXP_SUBSTR('abc','b'); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `REGEXP_SUBSTR('abc','b')` varchar(3) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL + `REGEXP_SUBSTR('abc','b')` varchar(3) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; EXPLAIN EXTENDED SELECT REGEXP_SUBSTR('abc','b'); diff --git a/mysql-test/main/func_regexp_pcre.test b/mysql-test/main/func_regexp_pcre.test index 37da65f296d..f3c4a25fe64 100644 --- a/mysql-test/main/func_regexp_pcre.test +++ b/mysql-test/main/func_regexp_pcre.test @@ -43,7 +43,8 @@ INSERT INTO t2 VALUES ('\\p{Han}'),('\\p{Hangul}'); INSERT INTO t2 VALUES ('\\p{Sinhala}'), ('\\p{Tamil}'); INSERT INTO t2 VALUES ('\\p{L}'),('\\p{Ll}'),('\\p{Lu}'),('\\p{L&}'); INSERT INTO t2 VALUES ('[[:alpha:]]'),('[[:digit:]]'); -SELECT class, ch, ch RLIKE class FROM t1, t2 ORDER BY class, BINARY ch; +# Use "ORDER BY BINARY" to avoid dependency on the default utf8 collation +SELECT class, ch, ch RLIKE class FROM t1, t2 ORDER BY BINARY class, BINARY ch; DROP TABLE t1, t2; # Checking that UCP is disabled by default for binary data diff --git a/mysql-test/main/func_sformat.result b/mysql-test/main/func_sformat.result index 11825604f1d..08f1c72a209 100644 --- a/mysql-test/main/func_sformat.result +++ b/mysql-test/main/func_sformat.result @@ -428,7 +428,7 @@ create table t1 as select sformat(_ucs2 x'003D007B007D003D', _ucs2 x'04420435044 show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `x` longtext CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL + `x` longtext CHARACTER SET ucs2 COLLATE ucs2_uca1400_ai_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop table t1; set names latin1; diff --git a/mysql-test/main/func_str.result b/mysql-test/main/func_str.result index 5abfadabd52..19379396303 100644 --- a/mysql-test/main/func_str.result +++ b/mysql-test/main/func_str.result @@ -5150,9 +5150,9 @@ FROM t1; SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( - `cn` char(0) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL, - `c0` char(0) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL, - `c1` char(0) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL + `cn` char(0) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL, + `c0` char(0) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL, + `c1` char(0) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1, t2; # @@ -5168,9 +5168,9 @@ FROM t1; SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( - `cn` char(0) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL, - `c0` char(0) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL, - `c1` char(0) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL + `cn` char(0) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL, + `c0` char(0) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL, + `c1` char(0) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1, t2; CREATE TABLE t1 (i BIGINT); @@ -5183,9 +5183,9 @@ FROM t1; SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( - `cn` char(0) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL, - `c0` char(0) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL, - `c1` char(0) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL + `cn` char(0) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL, + `c0` char(0) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL, + `c1` char(0) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1, t2; CREATE TABLE t1 (i BIGINT); @@ -5198,9 +5198,9 @@ FROM t1; SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( - `cn` char(0) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL, - `c0` char(0) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL, - `c1` char(0) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL + `cn` char(0) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL, + `c0` char(0) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL, + `c1` char(0) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1, t2; CREATE TABLE t1 (i BIGINT); @@ -5213,9 +5213,9 @@ FROM t1; SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( - `cn` char(0) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL, - `c0` char(0) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL, - `c1` varchar(20) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL + `cn` char(0) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL, + `c0` char(0) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL, + `c1` varchar(20) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SELECT c1 FROM t2; c1 @@ -5261,7 +5261,7 @@ conv(i,16,2) SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( - `conv(i,16,2)` varchar(64) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL + `conv(i,16,2)` varchar(64) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1,t2; # @@ -5689,6 +5689,15 @@ id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE NULL NULL NULL NULL NULL NULL NULL NULL No tables used Warnings: Note 1003 select cast(1 as char charset binary) AS `c`,convert('a' using binary) AS `CONVERT('a' USING binary)`,cast('a' as char charset binary) AS `BINARY'a'` +SELECT +coercibility(collation('a')), +coercibility(charset('a')), +coercibility(user()), +coercibility(database()); +coercibility(collation('a')) 3 +coercibility(charset('a')) 3 +coercibility(user()) 3 +coercibility(database()) 3 # # End of 11.5 tests # diff --git a/mysql-test/main/func_str.test b/mysql-test/main/func_str.test index b400d2639ea..31ec4033df7 100644 --- a/mysql-test/main/func_str.test +++ b/mysql-test/main/func_str.test @@ -2597,6 +2597,14 @@ EXPLAIN EXTENDED SELECT CONVERT('a' USING binary), BINARY'a'; +--vertical_results +SELECT + coercibility(collation('a')), + coercibility(charset('a')), + coercibility(user()), + coercibility(database()); +--horizontal_results + --echo # --echo # End of 11.5 tests --echo # diff --git a/mysql-test/main/information_schema.result b/mysql-test/main/information_schema.result index 49f13f25f86..26c0ed08d1c 100644 --- a/mysql-test/main/information_schema.result +++ b/mysql-test/main/information_schema.result @@ -649,11 +649,11 @@ alter table t1 default character set utf8; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `CHARACTER_SET_NAME` varchar(32) NOT NULL, - `DEFAULT_COLLATE_NAME` varchar(64) NOT NULL, - `DESCRIPTION` varchar(60) NOT NULL, + `CHARACTER_SET_NAME` varchar(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL, + `DEFAULT_COLLATE_NAME` varchar(64) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL, + `DESCRIPTION` varchar(60) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL, `MAXLEN` bigint(3) NOT NULL -) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci drop table t1; create view v1 as select * from information_schema.TABLES; drop view v1; @@ -2514,7 +2514,7 @@ DROP TABLE t1; # # MDEV-24868 Server crashes in optimize_schema_tables_memory_usage after select from information_schema.innodb_sys_columns # -create table t1 ( name varchar(64) character set utf8, len int); +create table t1 ( name varchar(64) character set utf8 collate utf8_general_ci, len int); select * from t1 where (name, len) in (select name, len from information_schema.innodb_sys_columns having len = 8); name len drop table t1; diff --git a/mysql-test/main/information_schema.test b/mysql-test/main/information_schema.test index fe9853da70f..afc85e05f4e 100644 --- a/mysql-test/main/information_schema.test +++ b/mysql-test/main/information_schema.test @@ -2070,7 +2070,7 @@ DROP TABLE t1; --echo # --echo # MDEV-24868 Server crashes in optimize_schema_tables_memory_usage after select from information_schema.innodb_sys_columns --echo # -create table t1 ( name varchar(64) character set utf8, len int); +create table t1 ( name varchar(64) character set utf8 collate utf8_general_ci, len int); select * from t1 where (name, len) in (select name, len from information_schema.innodb_sys_columns having len = 8); drop table t1; diff --git a/mysql-test/main/information_schema_parameters.result b/mysql-test/main/information_schema_parameters.result index a8f2c187393..e31b061bc60 100644 --- a/mysql-test/main/information_schema_parameters.result +++ b/mysql-test/main/information_schema_parameters.result @@ -553,8 +553,8 @@ RETURN CONCAT('XYZ, ' ,s); SELECT * FROM INFORMATION_SCHEMA.PARAMETERS WHERE SPECIFIC_SCHEMA = 'i_s_parameters_test' AND SPECIFIC_NAME = 'test_func5'; SPECIFIC_CATALOG SPECIFIC_SCHEMA SPECIFIC_NAME ORDINAL_POSITION PARAMETER_MODE PARAMETER_NAME DATA_TYPE CHARACTER_MAXIMUM_LENGTH CHARACTER_OCTET_LENGTH NUMERIC_PRECISION NUMERIC_SCALE DATETIME_PRECISION CHARACTER_SET_NAME COLLATION_NAME DTD_IDENTIFIER ROUTINE_TYPE -def i_s_parameters_test test_func5 0 NULL NULL varchar 30 90 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(30) FUNCTION -def i_s_parameters_test test_func5 1 IN s char 20 60 NULL NULL NULL utf8mb3 utf8mb3_general_ci char(20) FUNCTION +def i_s_parameters_test test_func5 0 NULL NULL varchar 30 90 NULL NULL NULL utf8mb3 utf8mb3_uca1400_ai_ci varchar(30) FUNCTION +def i_s_parameters_test test_func5 1 IN s char 20 60 NULL NULL NULL utf8mb3 utf8mb3_uca1400_ai_ci char(20) FUNCTION DROP DATABASE i_s_parameters_test; USE test; # diff --git a/mysql-test/main/information_schema_routines.result b/mysql-test/main/information_schema_routines.result index dd2e8d657de..ebf961cdf31 100644 --- a/mysql-test/main/information_schema_routines.result +++ b/mysql-test/main/information_schema_routines.result @@ -911,7 +911,7 @@ RETURN CONCAT('XYZ, ' ,s); SELECT * FROM INFORMATION_SCHEMA.ROUTINES WHERE ROUTINE_SCHEMA = 'i_s_routines_test' AND ROUTINE_NAME = 'test_func5'; SPECIFIC_NAME ROUTINE_CATALOG ROUTINE_SCHEMA ROUTINE_NAME ROUTINE_TYPE DATA_TYPE CHARACTER_MAXIMUM_LENGTH CHARACTER_OCTET_LENGTH NUMERIC_PRECISION NUMERIC_SCALE DATETIME_PRECISION CHARACTER_SET_NAME COLLATION_NAME DTD_IDENTIFIER ROUTINE_BODY ROUTINE_DEFINITION EXTERNAL_NAME EXTERNAL_LANGUAGE PARAMETER_STYLE IS_DETERMINISTIC SQL_DATA_ACCESS SQL_PATH SECURITY_TYPE CREATED LAST_ALTERED SQL_MODE ROUTINE_COMMENT DEFINER CHARACTER_SET_CLIENT COLLATION_CONNECTION DATABASE_COLLATION -test_func5 def i_s_routines_test test_func5 FUNCTION varchar 30 90 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(30) SQL RETURN CONCAT('XYZ, ' ,s) NULL NULL SQL NO CONTAINS SQL NULL DEFINER root@localhost latin1 latin1_swedish_ci utf8mb3_general_ci +test_func5 def i_s_routines_test test_func5 FUNCTION varchar 30 90 NULL NULL NULL utf8mb3 utf8mb3_uca1400_ai_ci varchar(30) SQL RETURN CONCAT('XYZ, ' ,s) NULL NULL SQL NO CONTAINS SQL NULL DEFINER root@localhost latin1 latin1_swedish_ci utf8mb3_uca1400_ai_ci DROP DATABASE i_s_routines_test; # # MDEV-20609 Full table scan in INFORMATION_SCHEMA.PARAMETERS/ROUTINES diff --git a/mysql-test/main/json_normalize.result b/mysql-test/main/json_normalize.result index b1363ea9099..263424f8ce6 100644 --- a/mysql-test/main/json_normalize.result +++ b/mysql-test/main/json_normalize.result @@ -26,7 +26,7 @@ json json_normalize(json) create view v1 as (select json, json_normalize(json) norm_json from t1); show create view v1; View Create View character_set_client collation_connection -v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS (select `t1`.`json` AS `json`,json_normalize(`t1`.`json`) AS `norm_json` from `t1`) utf8mb3 utf8mb3_general_ci +v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS (select `t1`.`json` AS `json`,json_normalize(`t1`.`json`) AS `norm_json` from `t1`) utf8mb3 utf8mb3_uca1400_ai_ci select * from v1 order by json; json norm_json diff --git a/mysql-test/main/key.result b/mysql-test/main/key.result index e6bb46af2b1..4c905fc1359 100644 --- a/mysql-test/main/key.result +++ b/mysql-test/main/key.result @@ -244,8 +244,8 @@ create table t1 (c varchar(30) character set utf8, t text character set utf8, un show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `c` varchar(30) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL, - `t` text CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL, + `c` varchar(30) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL, + `t` text CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL, UNIQUE KEY `c` (`c`(2)), UNIQUE KEY `t` (`t`(3)) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci diff --git a/mysql-test/main/locale.result b/mysql-test/main/locale.result index 71707c60147..cd32891f746 100644 --- a/mysql-test/main/locale.result +++ b/mysql-test/main/locale.result @@ -105,9 +105,9 @@ Warnings: Note 1265 Data truncated for column 'd' at row 1 SET lc_time_names=ru_RU; SELECT c FROM t1 WHERE DAYNAME(d)<>c; -ERROR HY000: Illegal mix of collations (utf8mb3_general_ci,COERCIBLE) and (latin1_swedish_ci,IMPLICIT) for operation '<>' +ERROR HY000: Illegal mix of collations (utf8mb3_uca1400_ai_ci,COERCIBLE) and (latin1_swedish_ci,IMPLICIT) for operation '<>' SELECT c FROM t1 WHERE MONTHNAME(d)<>c; -ERROR HY000: Illegal mix of collations (utf8mb3_general_ci,COERCIBLE) and (latin1_swedish_ci,IMPLICIT) for operation '<>' +ERROR HY000: Illegal mix of collations (utf8mb3_uca1400_ai_ci,COERCIBLE) and (latin1_swedish_ci,IMPLICIT) for operation '<>' SET lc_time_names=en_US; SELECT c FROM t1 WHERE DAYNAME(d)<>c; c @@ -232,7 +232,7 @@ a a1 b b1 10 Oct October 10 Окт Октября 123,456,789.00 123'456'789,00 show create view v1; View Create View character_set_client collation_connection -v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select date_format('2001-10-02','%c %b %M') AS `a`,date_format('2001-10-02','%c %b %M','ru_RU') AS `a1`,format(123456789,2) AS `b`,format(123456789,2,'rm_CH') AS `b1` utf8mb3 utf8mb3_general_ci +v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select date_format('2001-10-02','%c %b %M') AS `a`,date_format('2001-10-02','%c %b %M','ru_RU') AS `a1`,format(123456789,2) AS `b`,format(123456789,2,'rm_CH') AS `b1` utf8mb3 utf8mb3_uca1400_ai_ci drop view v1; # # End of 10.2 tests diff --git a/mysql-test/main/log_tables.result b/mysql-test/main/log_tables.result index e64b71d4ed7..005b8913f10 100644 --- a/mysql-test/main/log_tables.result +++ b/mysql-test/main/log_tables.result @@ -288,7 +288,7 @@ ON UPDATE CURRENT_TIMESTAMP, `server_id` int(10) unsigned NOT NULL, `command_type` varchar(64) NOT NULL, `argument` mediumtext NOT NULL -) ENGINE=CSV DEFAULT CHARSET=utf8 COMMENT='General log'; +) ENGINE=CSV DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci COMMENT='General log'; CREATE TABLE `slow_log` ( `start_time` timestamp(6) NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, @@ -304,7 +304,7 @@ ON UPDATE CURRENT_TIMESTAMP, `sql_text` mediumtext NOT NULL, `thread_id` BIGINT(21) UNSIGNED NOT NULL, `rows_affected` bigint(20) unsigned NOT NULL -) ENGINE=CSV DEFAULT CHARSET=utf8 COMMENT='Slow log'; +) ENGINE=CSV DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci COMMENT='Slow log'; set global general_log='ON'; set global slow_query_log='ON'; use test; diff --git a/mysql-test/main/log_tables.test b/mysql-test/main/log_tables.test index 37df8d46859..b030b3d53ec 100644 --- a/mysql-test/main/log_tables.test +++ b/mysql-test/main/log_tables.test @@ -288,7 +288,7 @@ CREATE TABLE `general_log` ( `server_id` int(10) unsigned NOT NULL, `command_type` varchar(64) NOT NULL, `argument` mediumtext NOT NULL -) ENGINE=CSV DEFAULT CHARSET=utf8 COMMENT='General log'; +) ENGINE=CSV DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci COMMENT='General log'; CREATE TABLE `slow_log` ( `start_time` timestamp(6) NOT NULL DEFAULT CURRENT_TIMESTAMP @@ -305,7 +305,7 @@ CREATE TABLE `slow_log` ( `sql_text` mediumtext NOT NULL, `thread_id` BIGINT(21) UNSIGNED NOT NULL, `rows_affected` bigint(20) unsigned NOT NULL -) ENGINE=CSV DEFAULT CHARSET=utf8 COMMENT='Slow log'; +) ENGINE=CSV DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci COMMENT='Slow log'; set global general_log='ON'; set global slow_query_log='ON'; diff --git a/mysql-test/main/long_unique_bugs.result b/mysql-test/main/long_unique_bugs.result index 03d40be897f..6ea126665c3 100644 --- a/mysql-test/main/long_unique_bugs.result +++ b/mysql-test/main/long_unique_bugs.result @@ -301,7 +301,7 @@ unique key a using hash (c(1)) show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `c` char(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, + `c` char(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_uca1400_ai_ci DEFAULT NULL, UNIQUE KEY `a` (`c`(1)) USING HASH ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci insert into t1 values ('б'); diff --git a/mysql-test/main/lowercase_table2.result b/mysql-test/main/lowercase_table2.result index 3f3b8512030..ab6d5e1be9a 100644 --- a/mysql-test/main/lowercase_table2.result +++ b/mysql-test/main/lowercase_table2.result @@ -357,6 +357,27 @@ drop user 'mysqltest_1'@'localhost'; drop tables a, B; drop database db1; # +# MDEV-32025 Crashes in MDL_key::mdl_key_init with lower-case-table-names=2 +# +CREATE DATABASE `#mysql50#D+b1`; +ALTER DATABASE `#mysql50#D+b1` UPGRADE DATA DIRECTORY NAME; +SHOW CREATE DATABASE `D+b1`; +Database Create Database +D+b1 CREATE DATABASE `D+b1` /*!40100 DEFAULT CHARACTER SET latin1 COLLATE latin1_swedish_ci */ +SHOW CREATE DATABASE `d+b1`; +Database Create Database +d+b1 CREATE DATABASE `d+b1` /*!40100 DEFAULT CHARACTER SET latin1 COLLATE latin1_swedish_ci */ +DROP DATABASE `D+b1`; +CREATE DATABASE Db1; +ALTER DATABASE Db1 DEFAULT CHARACTER SET utf8; +SHOW CREATE DATABASE Db1; +Database Create Database +Db1 CREATE DATABASE `Db1` /*!40100 DEFAULT CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci */ +SHOW CREATE DATABASE db1; +Database Create Database +db1 CREATE DATABASE `db1` /*!40100 DEFAULT CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci */ +DROP DATABASE Db1; +# # MDEV-32026 lowercase_table2.test failures in 11.3 # CREATE DATABASE Db1; @@ -396,10 +417,10 @@ CREATE DATABASE Db1; ALTER DATABASE Db1 DEFAULT CHARACTER SET utf8; SHOW CREATE DATABASE Db1; Database Create Database -Db1 CREATE DATABASE `Db1` /*!40100 DEFAULT CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci */ +Db1 CREATE DATABASE `Db1` /*!40100 DEFAULT CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci */ SHOW CREATE DATABASE db1; Database Create Database -db1 CREATE DATABASE `db1` /*!40100 DEFAULT CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci */ +db1 CREATE DATABASE `db1` /*!40100 DEFAULT CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci */ DROP DATABASE Db1; USE test; # End of 10.4 tests diff --git a/mysql-test/main/lowercase_table5.result b/mysql-test/main/lowercase_table5.result index 2843559d4f5..b284de8e996 100644 --- a/mysql-test/main/lowercase_table5.result +++ b/mysql-test/main/lowercase_table5.result @@ -1,14 +1,14 @@ CREATE DATABASE mysql_TEST CHARACTER SET utf8; SHOW CREATE DATABASE mysql_TEST; Database Create Database -mysql_TEST CREATE DATABASE `mysql_TEST` /*!40100 DEFAULT CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci */ +mysql_TEST CREATE DATABASE `mysql_TEST` /*!40100 DEFAULT CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci */ CREATE DATABASE mysql_test CHARACTER SET latin2; SHOW CREATE DATABASE mysql_test; Database Create Database mysql_test CREATE DATABASE `mysql_test` /*!40100 DEFAULT CHARACTER SET latin2 COLLATE latin2_general_ci */ SHOW CREATE DATABASE mysql_TEST; Database Create Database -mysql_TEST CREATE DATABASE `mysql_TEST` /*!40100 DEFAULT CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci */ +mysql_TEST CREATE DATABASE `mysql_TEST` /*!40100 DEFAULT CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci */ DROP DATABASE mysql_test; DROP DATABASE mysql_TEST; # diff --git a/mysql-test/main/mix2_myisam.result b/mysql-test/main/mix2_myisam.result index 1044704c518..6e39556f171 100644 --- a/mysql-test/main/mix2_myisam.result +++ b/mysql-test/main/mix2_myisam.result @@ -1957,7 +1957,7 @@ create table t1 (v char(10) character set utf8); show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `v` char(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL + `v` char(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop table t1; create table t1 (v varchar(10), c char(10)) row_format=fixed; @@ -2009,7 +2009,7 @@ Note 1246 Converting column 'v' from VARCHAR to TEXT show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `v` mediumtext CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL + `v` mediumtext CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop table t1; set default_storage_engine=MEMORY; diff --git a/mysql-test/main/mrr_icp_extra.result b/mysql-test/main/mrr_icp_extra.result index 48b3b91d271..4df6ebffc8a 100644 --- a/mysql-test/main/mrr_icp_extra.result +++ b/mysql-test/main/mrr_icp_extra.result @@ -766,7 +766,7 @@ create table t1 (v char(10) character set utf8); show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `v` char(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL + `v` char(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop table t1; create table t1 (v varchar(10), c char(10)) row_format=fixed; diff --git a/mysql-test/main/myisam.result b/mysql-test/main/myisam.result index dbe9a32ab11..298dbdc64cb 100644 --- a/mysql-test/main/myisam.result +++ b/mysql-test/main/myisam.result @@ -1678,7 +1678,7 @@ create table t1 (v char(10) character set utf8); show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `v` char(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL + `v` char(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop table t1; create table t1 (v varchar(10), c char(10)) row_format=fixed; @@ -1730,7 +1730,7 @@ Note 1246 Converting column 'v' from VARCHAR to TEXT show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `v` mediumtext CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL + `v` mediumtext CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop table t1; set statement sql_mode='' for @@ -2408,7 +2408,7 @@ KEY (c2) MyISAM file: MYSQLD_DATADIR/test/t1 Record format: Packed -Character set: utf8mb3_general_ci (33) +Character set: ? (0) Data records: 0 Deleted blocks: 0 Recordlength: 94 diff --git a/mysql-test/main/mysqlbinlog.result b/mysql-test/main/mysqlbinlog.result index 4767246233b..21bc5050871 100644 --- a/mysql-test/main/mysqlbinlog.result +++ b/mysql-test/main/mysqlbinlog.result @@ -564,7 +564,7 @@ SET @@session.sql_mode=#/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; SET @@session.character_set_client=latin1,@@session.collation_connection=8,@@session.collation_server=#/*!*/; -SET @@session.character_set_collations=''/*!*/; +SET @@session.character_set_collations='utf8mb3=utf8mb3_uca1400_ai_ci,ucs2=ucs2_uca1400_ai_ci,utf8mb4=utf8mb4_uca1400_ai_ci,utf16=utf16_uca1400_ai_ci,utf32=utf32_uca1400_ai_ci'/*!*/; SET @@session.lc_time_names=0/*!*/; SET @@session.collation_database=DEFAULT/*!*/; create table t1 (a varchar(64) character set utf8) diff --git a/mysql-test/main/mysqlcheck.result b/mysql-test/main/mysqlcheck.result index 4955bd0292a..540d50ddec6 100644 --- a/mysql-test/main/mysqlcheck.result +++ b/mysql-test/main/mysqlcheck.result @@ -262,8 +262,8 @@ USE `a@b`; SELECT * FROM INFORMATION_SCHEMA.TRIGGERS WHERE TRIGGER_SCHEMA="a@b" ORDER BY trigger_name; TRIGGER_CATALOG TRIGGER_SCHEMA TRIGGER_NAME EVENT_MANIPULATION EVENT_OBJECT_CATALOG EVENT_OBJECT_SCHEMA EVENT_OBJECT_TABLE ACTION_ORDER ACTION_CONDITION ACTION_STATEMENT ACTION_ORIENTATION ACTION_TIMING ACTION_REFERENCE_OLD_TABLE ACTION_REFERENCE_NEW_TABLE ACTION_REFERENCE_OLD_ROW ACTION_REFERENCE_NEW_ROW CREATED SQL_MODE DEFINER CHARACTER_SET_CLIENT COLLATION_CONNECTION DATABASE_COLLATION -def a@b tr1 INSERT def a@b c@d 1 NULL SET NEW.a = 10 * NEW.a ROW BEFORE NULL NULL OLD NEW NULL root@localhost utf8mb3 utf8mb3_general_ci latin1_swedish_ci -def a@b tr2 INSERT def a@b t1 1 NULL SET NEW.a = 100 * NEW.a ROW BEFORE NULL NULL OLD NEW NULL root@localhost utf8mb3 utf8mb3_general_ci latin1_swedish_ci +def a@b tr1 INSERT def a@b c@d 1 NULL SET NEW.a = 10 * NEW.a ROW BEFORE NULL NULL OLD NEW NULL root@localhost utf8mb3 utf8mb3_uca1400_ai_ci latin1_swedish_ci +def a@b tr2 INSERT def a@b t1 1 NULL SET NEW.a = 100 * NEW.a ROW BEFORE NULL NULL OLD NEW NULL root@localhost utf8mb3 utf8mb3_uca1400_ai_ci latin1_swedish_ci INSERT INTO `c@d` VALUES (2), (1); SELECT * FROM `c@d`; a diff --git a/mysql-test/main/mysqld--help.result b/mysql-test/main/mysqld--help.result index ee75f586970..d84f23d9335 100644 --- a/mysql-test/main/mysqld--help.result +++ b/mysql-test/main/mysqld--help.result @@ -1635,7 +1635,7 @@ binlog-stmt-cache-size 32768 block-encryption-mode aes-128-ecb bulk-insert-buffer-size 8388608 character-set-client-handshake TRUE -character-set-collations +character-set-collations utf8mb3=uca1400_ai_ci,utf8mb4=uca1400_ai_ci,ucs2=uca1400_ai_ci,utf16=uca1400_ai_ci,utf32=uca1400_ai_ci character-set-filesystem binary character-sets-dir MYSQL_CHARSETSDIR/ chroot (No default value) diff --git a/mysql-test/main/mysqldump.result b/mysql-test/main/mysqldump.result index e14cd939f33..e1c15cfca2c 100644 --- a/mysql-test/main/mysqldump.result +++ b/mysql-test/main/mysqldump.result @@ -5381,7 +5381,7 @@ RETURN CONCAT(']]>, ', c1, '!'); - + 0 OR JSON_VALID(js2)) ) CHARACTER SET utf8; SELECT * FROM t1; Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr -def test t1 t1 js0 js0 252 (format=json) 4294967295 0 Y 144 0 33 -def test t1 t1 js1 js1 252 (format=json) 196605 0 Y 16 0 33 -def test t1 t1 js2 js2 252 (format=json) 196605 0 Y 16 0 33 -def test t1 t1 js3 js3 252 196605 0 Y 16 0 33 +def test t1 t1 js0 js0 252 (format=json) 4294967295 0 Y 144 0 192 +def test t1 t1 js1 js1 252 (format=json) 196605 0 Y 16 0 192 +def test t1 t1 js2 js2 252 (format=json) 196605 0 Y 16 0 192 +def test t1 t1 js3 js3 252 196605 0 Y 16 0 192 js0 js1 js2 js3 SELECT js0, JSON_COMPACT(js0), JSON_COMPACT('{}') FROM t1; Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr -def test t1 t1 js0 js0 252 (format=json) 4294967295 0 Y 144 0 33 -def JSON_COMPACT(js0) 251 (format=json) 4294967295 0 Y 128 0 33 -def JSON_COMPACT('{}') 253 (format=json) 6 0 Y 0 0 33 +def test t1 t1 js0 js0 252 (format=json) 4294967295 0 Y 144 0 192 +def JSON_COMPACT(js0) 251 (format=json) 4294967295 0 Y 128 0 192 +def JSON_COMPACT('{}') 253 (format=json) 6 0 Y 0 0 192 js0 JSON_COMPACT(js0) JSON_COMPACT('{}') DROP TABLE t1; # @@ -132,21 +132,21 @@ CREATE TABLE t1 (a JSON); INSERT INTO t1 VALUES ('{"a":"b"}'); SELECT a, JSON_COMPACT(a), COALESCE(a) FROM t1; Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr -def test t1 t1 a a 252 (format=json) 4294967295 9 Y 144 0 33 -def JSON_COMPACT(a) 251 (format=json) 4294967295 9 Y 128 0 33 -def COALESCE(a) 251 (format=json) 4294967295 9 Y 128 39 33 +def test t1 t1 a a 252 (format=json) 4294967295 9 Y 144 0 192 +def JSON_COMPACT(a) 251 (format=json) 4294967295 9 Y 128 0 192 +def COALESCE(a) 251 (format=json) 4294967295 9 Y 128 39 192 a JSON_COMPACT(a) COALESCE(a) {"a":"b"} {"a":"b"} {"a":"b"} SELECT JSON_ARRAYAGG(1), JSON_ARRAYAGG(a) FROM t1; Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr -def JSON_ARRAYAGG(1) 252 (format=json) 9437184 3 Y 0 0 33 -def JSON_ARRAYAGG(a) 252 (format=json) 12582912 11 Y 128 0 33 +def JSON_ARRAYAGG(1) 252 (format=json) 9437184 3 Y 0 0 192 +def JSON_ARRAYAGG(a) 252 (format=json) 12582912 11 Y 128 0 192 JSON_ARRAYAGG(1) JSON_ARRAYAGG(a) [1] [{"a":"b"}] SELECT JSON_OBJECTAGG('a','b'), JSON_OBJECTAGG('a',a) FROM t1; Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr -def JSON_OBJECTAGG('a','b') 252 (format=json) 9437184 9 Y 0 0 33 -def JSON_OBJECTAGG('a',a) 252 (format=json) 12582912 15 Y 128 0 33 +def JSON_OBJECTAGG('a','b') 252 (format=json) 9437184 9 Y 0 0 192 +def JSON_OBJECTAGG('a',a) 252 (format=json) 12582912 15 Y 128 0 192 JSON_OBJECTAGG('a','b') JSON_OBJECTAGG('a',a) {"a":"b"} {"a":{"a":"b"}} DROP TABLE t1; @@ -155,7 +155,7 @@ DROP TABLE t1; # SELECT json_object('a', (SELECT json_objectagg(b, c) FROM (SELECT 'b','c') d)) AS j FROM DUAL; Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr -def j 250 (format=json) 9437310 16 Y 0 39 33 +def j 250 (format=json) 9437310 16 Y 0 39 192 j {"a": {"b":"c"}} # diff --git a/mysql-test/main/type_nchar.result b/mysql-test/main/type_nchar.result index 5fa1a004aba..1fd86e4be16 100644 --- a/mysql-test/main/type_nchar.result +++ b/mysql-test/main/type_nchar.result @@ -3,48 +3,48 @@ create table t1 (c nchar(10)); show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `c` char(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL + `c` char(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop table t1; create table t1 (c national char(10)); show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `c` char(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL + `c` char(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop table t1; create table t1 (c national varchar(10)); show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `c` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL + `c` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop table t1; create table t1 (c nvarchar(10)); show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `c` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL + `c` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop table t1; create table t1 (c nchar varchar(10)); show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `c` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL + `c` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop table t1; create table t1 (c national character varying(10)); show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `c` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL + `c` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop table t1; create table t1 (c nchar varying(10)); show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `c` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL + `c` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop table t1; diff --git a/mysql-test/main/type_set.result b/mysql-test/main/type_set.result index e727c2cbf2f..c05064c508f 100644 --- a/mysql-test/main/type_set.result +++ b/mysql-test/main/type_set.result @@ -679,10 +679,10 @@ t2 CREATE TABLE `t2` ( DROP TABLE t2; SELECT c_int FROM t1 UNION SELECT c_set FROM t1; Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr -def c_int c_int 253 33 0 Y 16384 0 33 +def c_int c_int 253 33 0 Y 16384 0 192 c_int SELECT COALESCE(c_int, c_set) FROM t1; Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr -def COALESCE(c_int, c_set) 253 33 0 Y 0 39 33 +def COALESCE(c_int, c_set) 253 33 0 Y 0 39 192 COALESCE(c_int, c_set) DROP TABLE t1; diff --git a/mysql-test/main/union.result b/mysql-test/main/union.result index 797abaf9de5..efcadfc0ad1 100644 --- a/mysql-test/main/union.result +++ b/mysql-test/main/union.result @@ -1272,8 +1272,8 @@ c ENUM("one", "two") show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` enum('ä','ö','ü') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'ü', - `b` enum('one','two') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL, + `a` enum('ä','ö','ü') CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci NOT NULL DEFAULT 'ü', + `b` enum('one','two') CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL, `c` enum('one','two') DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci insert into t1 values ('ä', 'one', 'one'), ('ö', 'two', 'one'), ('ü', NULL, NULL); diff --git a/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row.result b/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row.result index 5c769b499ab..95378fa7ef0 100644 --- a/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row.result +++ b/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row.result @@ -2319,7 +2319,7 @@ DROP TABLE `t1` /* generated by server */ # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid= SET TIMESTAMP=1000000000/*!*/; -SET @@session.character_set_collations=''/*!*/; +SET @@session.character_set_collations='utf8mb3=utf8mb3_uca1400_ai_ci,ucs2=ucs2_uca1400_ai_ci,utf8mb4=utf8mb4_uca1400_ai_ci,utf16=utf16_uca1400_ai_ci,utf32=utf32_uca1400_ai_ci'/*!*/; CREATE TABLE t1 (c37 NATIONAL CHAR) /*!*/; # at # @@ -2378,7 +2378,7 @@ DROP TABLE `t1` /* generated by server */ # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid= SET TIMESTAMP=1000000000/*!*/; -SET @@session.character_set_collations=''/*!*/; +SET @@session.character_set_collations='utf8mb3=utf8mb3_uca1400_ai_ci,ucs2=ucs2_uca1400_ai_ci,utf8mb4=utf8mb4_uca1400_ai_ci,utf16=utf16_uca1400_ai_ci,utf32=utf32_uca1400_ai_ci'/*!*/; CREATE TABLE t1 (c38 NATIONAL CHAR(0)) /*!*/; # at # @@ -2437,7 +2437,7 @@ DROP TABLE `t1` /* generated by server */ # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid= SET TIMESTAMP=1000000000/*!*/; -SET @@session.character_set_collations=''/*!*/; +SET @@session.character_set_collations='utf8mb3=utf8mb3_uca1400_ai_ci,ucs2=ucs2_uca1400_ai_ci,utf8mb4=utf8mb4_uca1400_ai_ci,utf16=utf16_uca1400_ai_ci,utf32=utf32_uca1400_ai_ci'/*!*/; CREATE TABLE t1 (c39 NATIONAL CHAR(1)) /*!*/; # at # @@ -2496,7 +2496,7 @@ DROP TABLE `t1` /* generated by server */ # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid= SET TIMESTAMP=1000000000/*!*/; -SET @@session.character_set_collations=''/*!*/; +SET @@session.character_set_collations='utf8mb3=utf8mb3_uca1400_ai_ci,ucs2=ucs2_uca1400_ai_ci,utf8mb4=utf8mb4_uca1400_ai_ci,utf16=utf16_uca1400_ai_ci,utf32=utf32_uca1400_ai_ci'/*!*/; CREATE TABLE t1 (c40 NATIONAL CHAR(255)) /*!*/; # at # @@ -2579,7 +2579,7 @@ DROP TABLE `t1` /* generated by server */ # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid= SET TIMESTAMP=1000000000/*!*/; -SET @@session.character_set_collations=''/*!*/; +SET @@session.character_set_collations='utf8mb3=utf8mb3_uca1400_ai_ci,ucs2=ucs2_uca1400_ai_ci,utf8mb4=utf8mb4_uca1400_ai_ci,utf16=utf16_uca1400_ai_ci,utf32=utf32_uca1400_ai_ci'/*!*/; CREATE TABLE t1 (c41 CHAR CHARACTER SET UCS2) /*!*/; # at # @@ -2638,7 +2638,7 @@ DROP TABLE `t1` /* generated by server */ # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid= SET TIMESTAMP=1000000000/*!*/; -SET @@session.character_set_collations=''/*!*/; +SET @@session.character_set_collations='utf8mb3=utf8mb3_uca1400_ai_ci,ucs2=ucs2_uca1400_ai_ci,utf8mb4=utf8mb4_uca1400_ai_ci,utf16=utf16_uca1400_ai_ci,utf32=utf32_uca1400_ai_ci'/*!*/; CREATE TABLE t1 (c42 CHAR(0) CHARACTER SET UCS2) /*!*/; # at # @@ -2697,7 +2697,7 @@ DROP TABLE `t1` /* generated by server */ # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid= SET TIMESTAMP=1000000000/*!*/; -SET @@session.character_set_collations=''/*!*/; +SET @@session.character_set_collations='utf8mb3=utf8mb3_uca1400_ai_ci,ucs2=ucs2_uca1400_ai_ci,utf8mb4=utf8mb4_uca1400_ai_ci,utf16=utf16_uca1400_ai_ci,utf32=utf32_uca1400_ai_ci'/*!*/; CREATE TABLE t1 (c43 CHAR(1) CHARACTER SET UCS2) /*!*/; # at # @@ -2756,7 +2756,7 @@ DROP TABLE `t1` /* generated by server */ # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid= SET TIMESTAMP=1000000000/*!*/; -SET @@session.character_set_collations=''/*!*/; +SET @@session.character_set_collations='utf8mb3=utf8mb3_uca1400_ai_ci,ucs2=ucs2_uca1400_ai_ci,utf8mb4=utf8mb4_uca1400_ai_ci,utf16=utf16_uca1400_ai_ci,utf32=utf32_uca1400_ai_ci'/*!*/; CREATE TABLE t1 (c44 CHAR(255) CHARACTER SET UCS2) /*!*/; # at # @@ -3071,7 +3071,7 @@ DROP TABLE `t1` /* generated by server */ # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid= SET TIMESTAMP=1000000000/*!*/; -SET @@session.character_set_collations=''/*!*/; +SET @@session.character_set_collations='utf8mb3=utf8mb3_uca1400_ai_ci,ucs2=ucs2_uca1400_ai_ci,utf8mb4=utf8mb4_uca1400_ai_ci,utf16=utf16_uca1400_ai_ci,utf32=utf32_uca1400_ai_ci'/*!*/; CREATE TABLE t1 (c49 NATIONAL VARCHAR(0)) /*!*/; # at # @@ -3130,7 +3130,7 @@ DROP TABLE `t1` /* generated by server */ # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid= SET TIMESTAMP=1000000000/*!*/; -SET @@session.character_set_collations=''/*!*/; +SET @@session.character_set_collations='utf8mb3=utf8mb3_uca1400_ai_ci,ucs2=ucs2_uca1400_ai_ci,utf8mb4=utf8mb4_uca1400_ai_ci,utf16=utf16_uca1400_ai_ci,utf32=utf32_uca1400_ai_ci'/*!*/; CREATE TABLE t1 (c50 NATIONAL VARCHAR(1)) /*!*/; # at # @@ -3189,7 +3189,7 @@ DROP TABLE `t1` /* generated by server */ # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid= SET TIMESTAMP=1000000000/*!*/; -SET @@session.character_set_collations=''/*!*/; +SET @@session.character_set_collations='utf8mb3=utf8mb3_uca1400_ai_ci,ucs2=ucs2_uca1400_ai_ci,utf8mb4=utf8mb4_uca1400_ai_ci,utf16=utf16_uca1400_ai_ci,utf32=utf32_uca1400_ai_ci'/*!*/; CREATE TABLE t1 (c51 NATIONAL VARCHAR(255)) /*!*/; # at # @@ -3272,7 +3272,7 @@ DROP TABLE `t1` /* generated by server */ # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid= SET TIMESTAMP=1000000000/*!*/; -SET @@session.character_set_collations=''/*!*/; +SET @@session.character_set_collations='utf8mb3=utf8mb3_uca1400_ai_ci,ucs2=ucs2_uca1400_ai_ci,utf8mb4=utf8mb4_uca1400_ai_ci,utf16=utf16_uca1400_ai_ci,utf32=utf32_uca1400_ai_ci'/*!*/; CREATE TABLE t1 (c52 NATIONAL VARCHAR(261)) /*!*/; # at # @@ -3355,7 +3355,7 @@ DROP TABLE `t1` /* generated by server */ # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid= SET TIMESTAMP=1000000000/*!*/; -SET @@session.character_set_collations=''/*!*/; +SET @@session.character_set_collations='utf8mb3=utf8mb3_uca1400_ai_ci,ucs2=ucs2_uca1400_ai_ci,utf8mb4=utf8mb4_uca1400_ai_ci,utf16=utf16_uca1400_ai_ci,utf32=utf32_uca1400_ai_ci'/*!*/; CREATE TABLE t1 (c53 VARCHAR(0) CHARACTER SET ucs2) /*!*/; # at # @@ -3414,7 +3414,7 @@ DROP TABLE `t1` /* generated by server */ # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid= SET TIMESTAMP=1000000000/*!*/; -SET @@session.character_set_collations=''/*!*/; +SET @@session.character_set_collations='utf8mb3=utf8mb3_uca1400_ai_ci,ucs2=ucs2_uca1400_ai_ci,utf8mb4=utf8mb4_uca1400_ai_ci,utf16=utf16_uca1400_ai_ci,utf32=utf32_uca1400_ai_ci'/*!*/; CREATE TABLE t1 (c54 VARCHAR(1) CHARACTER SET ucs2) /*!*/; # at # @@ -3473,7 +3473,7 @@ DROP TABLE `t1` /* generated by server */ # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid= SET TIMESTAMP=1000000000/*!*/; -SET @@session.character_set_collations=''/*!*/; +SET @@session.character_set_collations='utf8mb3=utf8mb3_uca1400_ai_ci,ucs2=ucs2_uca1400_ai_ci,utf8mb4=utf8mb4_uca1400_ai_ci,utf16=utf16_uca1400_ai_ci,utf32=utf32_uca1400_ai_ci'/*!*/; CREATE TABLE t1 (c55 VARCHAR(255) CHARACTER SET ucs2) /*!*/; # at # @@ -3532,7 +3532,7 @@ DROP TABLE `t1` /* generated by server */ # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid= SET TIMESTAMP=1000000000/*!*/; -SET @@session.character_set_collations=''/*!*/; +SET @@session.character_set_collations='utf8mb3=utf8mb3_uca1400_ai_ci,ucs2=ucs2_uca1400_ai_ci,utf8mb4=utf8mb4_uca1400_ai_ci,utf16=utf16_uca1400_ai_ci,utf32=utf32_uca1400_ai_ci'/*!*/; CREATE TABLE t1 (c56 VARCHAR(261) CHARACTER SET ucs2) /*!*/; # at # @@ -4671,7 +4671,7 @@ DROP TABLE `t1` /* generated by server */ # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid= SET TIMESTAMP=1000000000/*!*/; -SET @@session.character_set_collations=''/*!*/; +SET @@session.character_set_collations='utf8mb3=utf8mb3_uca1400_ai_ci,ucs2=ucs2_uca1400_ai_ci,utf8mb4=utf8mb4_uca1400_ai_ci,utf16=utf16_uca1400_ai_ci,utf32=utf32_uca1400_ai_ci'/*!*/; CREATE TABLE t1 (c67 TINYTEXT CHARACTER SET UCS2) /*!*/; # at # @@ -4730,7 +4730,7 @@ DROP TABLE `t1` /* generated by server */ # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid= SET TIMESTAMP=1000000000/*!*/; -SET @@session.character_set_collations=''/*!*/; +SET @@session.character_set_collations='utf8mb3=utf8mb3_uca1400_ai_ci,ucs2=ucs2_uca1400_ai_ci,utf8mb4=utf8mb4_uca1400_ai_ci,utf16=utf16_uca1400_ai_ci,utf32=utf32_uca1400_ai_ci'/*!*/; CREATE TABLE t1 (c70 TEXT CHARACTER SET UCS2) /*!*/; # at # @@ -4789,7 +4789,7 @@ DROP TABLE `t1` /* generated by server */ # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid= SET TIMESTAMP=1000000000/*!*/; -SET @@session.character_set_collations=''/*!*/; +SET @@session.character_set_collations='utf8mb3=utf8mb3_uca1400_ai_ci,ucs2=ucs2_uca1400_ai_ci,utf8mb4=utf8mb4_uca1400_ai_ci,utf16=utf16_uca1400_ai_ci,utf32=utf32_uca1400_ai_ci'/*!*/; CREATE TABLE t1 (c73 MEDIUMTEXT CHARACTER SET UCS2) /*!*/; # at # @@ -4848,7 +4848,7 @@ DROP TABLE `t1` /* generated by server */ # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid= SET TIMESTAMP=1000000000/*!*/; -SET @@session.character_set_collations=''/*!*/; +SET @@session.character_set_collations='utf8mb3=utf8mb3_uca1400_ai_ci,ucs2=ucs2_uca1400_ai_ci,utf8mb4=utf8mb4_uca1400_ai_ci,utf16=utf16_uca1400_ai_ci,utf32=utf32_uca1400_ai_ci'/*!*/; CREATE TABLE t1 (c76 LONGTEXT CHARACTER SET UCS2) /*!*/; # at # diff --git a/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_innodb.result b/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_innodb.result index 88a6e00e20b..f2be73c1684 100644 --- a/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_innodb.result +++ b/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_innodb.result @@ -2274,8 +2274,8 @@ SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.uniq SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C utf8mb3 *//*!*/; -SET @@session.character_set_client=utf8mb3,@@session.collation_connection=33,@@session.collation_server=X/*!*/; -SET @@session.character_set_collations=''/*!*/; +SET @@session.character_set_client=utf8mb3,@@session.collation_connection=2048,@@session.collation_server=X/*!*/; +SET @@session.character_set_collations='utf8mb3=utf8mb3_uca1400_ai_ci,ucs2=ucs2_uca1400_ai_ci,utf8mb4=utf8mb4_uca1400_ai_ci,utf16=utf16_uca1400_ai_ci,utf32=utf32_uca1400_ai_ci'/*!*/; SET @@session.lc_time_names=0/*!*/; SET @@session.collation_database=DEFAULT/*!*/; CREATE TABLE t1 ( @@ -5367,8 +5367,8 @@ SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.uniq SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C utf8mb3 *//*!*/; -SET @@session.character_set_client=utf8mb3,@@session.collation_connection=33,@@session.collation_server=X/*!*/; -SET @@session.character_set_collations=''/*!*/; +SET @@session.character_set_client=utf8mb3,@@session.collation_connection=2048,@@session.collation_server=X/*!*/; +SET @@session.character_set_collations='utf8mb3=utf8mb3_uca1400_ai_ci,ucs2=ucs2_uca1400_ai_ci,utf8mb4=utf8mb4_uca1400_ai_ci,utf16=utf16_uca1400_ai_ci,utf32=utf32_uca1400_ai_ci'/*!*/; SET @@session.lc_time_names=0/*!*/; SET @@session.collation_database=DEFAULT/*!*/; CREATE TABLE t1 ( @@ -5768,8 +5768,8 @@ SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.uniq SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C utf8mb3 *//*!*/; -SET @@session.character_set_client=utf8mb3,@@session.collation_connection=33,@@session.collation_server=X/*!*/; -SET @@session.character_set_collations=''/*!*/; +SET @@session.character_set_client=utf8mb3,@@session.collation_connection=2048,@@session.collation_server=X/*!*/; +SET @@session.character_set_collations='utf8mb3=utf8mb3_uca1400_ai_ci,ucs2=ucs2_uca1400_ai_ci,utf8mb4=utf8mb4_uca1400_ai_ci,utf16=utf16_uca1400_ai_ci,utf32=utf32_uca1400_ai_ci'/*!*/; SET @@session.lc_time_names=0/*!*/; SET @@session.collation_database=DEFAULT/*!*/; CREATE TABLE t1 ( @@ -5784,7 +5784,7 @@ c_1_n INT -- row number # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid= SET TIMESTAMP=1000000000/*!*/; -SET @@session.character_set_collations=''/*!*/; +SET @@session.character_set_collations='utf8mb3=utf8mb3_uca1400_ai_ci,ucs2=ucs2_uca1400_ai_ci,utf8mb4=utf8mb4_uca1400_ai_ci,utf16=utf16_uca1400_ai_ci,utf32=utf32_uca1400_ai_ci'/*!*/; CREATE TABLE t2 ( c_2_1 DATE, c_2_2 VARCHAR(255), @@ -5797,7 +5797,7 @@ c_2_n INT -- row number # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid= SET TIMESTAMP=1000000000/*!*/; -SET @@session.character_set_collations=''/*!*/; +SET @@session.character_set_collations='utf8mb3=utf8mb3_uca1400_ai_ci,ucs2=ucs2_uca1400_ai_ci,utf8mb4=utf8mb4_uca1400_ai_ci,utf16=utf16_uca1400_ai_ci,utf32=utf32_uca1400_ai_ci'/*!*/; CREATE TABLE t3 ( c_3_1 DATE, c_3_2 VARCHAR(255), @@ -6409,8 +6409,8 @@ SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.uniq SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C utf8mb3 *//*!*/; -SET @@session.character_set_client=utf8mb3,@@session.collation_connection=33,@@session.collation_server=X/*!*/; -SET @@session.character_set_collations=''/*!*/; +SET @@session.character_set_client=utf8mb3,@@session.collation_connection=2048,@@session.collation_server=X/*!*/; +SET @@session.character_set_collations='utf8mb3=utf8mb3_uca1400_ai_ci,ucs2=ucs2_uca1400_ai_ci,utf8mb4=utf8mb4_uca1400_ai_ci,utf16=utf16_uca1400_ai_ci,utf32=utf32_uca1400_ai_ci'/*!*/; SET @@session.lc_time_names=0/*!*/; SET @@session.collation_database=DEFAULT/*!*/; CREATE TABLE t1 ( diff --git a/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_myisam.result b/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_myisam.result index 1ae895691f1..579bed5439a 100644 --- a/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_myisam.result +++ b/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_myisam.result @@ -2272,8 +2272,8 @@ SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.uniq SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C utf8mb3 *//*!*/; -SET @@session.character_set_client=utf8mb3,@@session.collation_connection=33,@@session.collation_server=X/*!*/; -SET @@session.character_set_collations=''/*!*/; +SET @@session.character_set_client=utf8mb3,@@session.collation_connection=2048,@@session.collation_server=X/*!*/; +SET @@session.character_set_collations='utf8mb3=utf8mb3_uca1400_ai_ci,ucs2=ucs2_uca1400_ai_ci,utf8mb4=utf8mb4_uca1400_ai_ci,utf16=utf16_uca1400_ai_ci,utf32=utf32_uca1400_ai_ci'/*!*/; SET @@session.lc_time_names=0/*!*/; SET @@session.collation_database=DEFAULT/*!*/; CREATE TABLE t1 ( @@ -5387,8 +5387,8 @@ SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.uniq SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C utf8mb3 *//*!*/; -SET @@session.character_set_client=utf8mb3,@@session.collation_connection=33,@@session.collation_server=X/*!*/; -SET @@session.character_set_collations=''/*!*/; +SET @@session.character_set_client=utf8mb3,@@session.collation_connection=2048,@@session.collation_server=X/*!*/; +SET @@session.character_set_collations='utf8mb3=utf8mb3_uca1400_ai_ci,ucs2=ucs2_uca1400_ai_ci,utf8mb4=utf8mb4_uca1400_ai_ci,utf16=utf16_uca1400_ai_ci,utf32=utf32_uca1400_ai_ci'/*!*/; SET @@session.lc_time_names=0/*!*/; SET @@session.collation_database=DEFAULT/*!*/; CREATE TABLE t1 ( @@ -5794,8 +5794,8 @@ SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.uniq SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C utf8mb3 *//*!*/; -SET @@session.character_set_client=utf8mb3,@@session.collation_connection=33,@@session.collation_server=X/*!*/; -SET @@session.character_set_collations=''/*!*/; +SET @@session.character_set_client=utf8mb3,@@session.collation_connection=2048,@@session.collation_server=X/*!*/; +SET @@session.character_set_collations='utf8mb3=utf8mb3_uca1400_ai_ci,ucs2=ucs2_uca1400_ai_ci,utf8mb4=utf8mb4_uca1400_ai_ci,utf16=utf16_uca1400_ai_ci,utf32=utf32_uca1400_ai_ci'/*!*/; SET @@session.lc_time_names=0/*!*/; SET @@session.collation_database=DEFAULT/*!*/; CREATE TABLE t1 ( @@ -5810,7 +5810,7 @@ c_1_n INT -- row number # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid= SET TIMESTAMP=1000000000/*!*/; -SET @@session.character_set_collations=''/*!*/; +SET @@session.character_set_collations='utf8mb3=utf8mb3_uca1400_ai_ci,ucs2=ucs2_uca1400_ai_ci,utf8mb4=utf8mb4_uca1400_ai_ci,utf16=utf16_uca1400_ai_ci,utf32=utf32_uca1400_ai_ci'/*!*/; CREATE TABLE t2 ( c_2_1 DATE, c_2_2 VARCHAR(255), @@ -5823,7 +5823,7 @@ c_2_n INT -- row number # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid= SET TIMESTAMP=1000000000/*!*/; -SET @@session.character_set_collations=''/*!*/; +SET @@session.character_set_collations='utf8mb3=utf8mb3_uca1400_ai_ci,ucs2=ucs2_uca1400_ai_ci,utf8mb4=utf8mb4_uca1400_ai_ci,utf16=utf16_uca1400_ai_ci,utf32=utf32_uca1400_ai_ci'/*!*/; CREATE TABLE t3 ( c_3_1 DATE, c_3_2 VARCHAR(255), @@ -6445,8 +6445,8 @@ SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.uniq SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C utf8mb3 *//*!*/; -SET @@session.character_set_client=utf8mb3,@@session.collation_connection=33,@@session.collation_server=X/*!*/; -SET @@session.character_set_collations=''/*!*/; +SET @@session.character_set_client=utf8mb3,@@session.collation_connection=2048,@@session.collation_server=X/*!*/; +SET @@session.character_set_collations='utf8mb3=utf8mb3_uca1400_ai_ci,ucs2=ucs2_uca1400_ai_ci,utf8mb4=utf8mb4_uca1400_ai_ci,utf16=utf16_uca1400_ai_ci,utf32=utf32_uca1400_ai_ci'/*!*/; SET @@session.lc_time_names=0/*!*/; SET @@session.collation_database=DEFAULT/*!*/; CREATE TABLE t1 ( diff --git a/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_trans.result b/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_trans.result index 1d4a0257062..ab10e121ccb 100644 --- a/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_trans.result +++ b/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_trans.result @@ -151,7 +151,7 @@ SET @@session.sql_mode=1411383296/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; SET @@session.character_set_client=X,@@session.collation_connection=X,@@session.collation_server=X/*!*/; -SET @@session.character_set_collations=''/*!*/; +SET @@session.character_set_collations='utf8mb3=utf8mb3_uca1400_ai_ci,ucs2=ucs2_uca1400_ai_ci,utf8mb4=utf8mb4_uca1400_ai_ci,utf16=utf16_uca1400_ai_ci,utf32=utf32_uca1400_ai_ci'/*!*/; SET @@session.lc_time_names=0/*!*/; SET @@session.collation_database=DEFAULT/*!*/; CREATE TABLE t1 ( @@ -165,7 +165,7 @@ c2 VARCHAR(20) # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid= SET TIMESTAMP=1000000000/*!*/; -SET @@session.character_set_collations=''/*!*/; +SET @@session.character_set_collations='utf8mb3=utf8mb3_uca1400_ai_ci,ucs2=ucs2_uca1400_ai_ci,utf8mb4=utf8mb4_uca1400_ai_ci,utf16=utf16_uca1400_ai_ci,utf32=utf32_uca1400_ai_ci'/*!*/; CREATE TABLE t2 ( c1 INT, c2 VARCHAR(20) diff --git a/mysql-test/suite/binlog/r/binlog_row_binlog.result b/mysql-test/suite/binlog/r/binlog_row_binlog.result index fa111106cd6..4e0afb7c369 100644 --- a/mysql-test/suite/binlog/r/binlog_row_binlog.result +++ b/mysql-test/suite/binlog/r/binlog_row_binlog.result @@ -734,7 +734,7 @@ DROP TEMPORARY TABLE tmp1; END// CALL p1(); c1 c2 c3 d1 d2 d3 -utf8mb3_general_ci utf8mb3_unicode_ci utf8mb3_unicode_ci 2 2 2 +utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci utf8mb3_unicode_ci 2 2 2 include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Gtid # # GTID #-#-# diff --git a/mysql-test/suite/binlog/r/binlog_row_ctype_ucs.result b/mysql-test/suite/binlog/r/binlog_row_ctype_ucs.result index c9b144d22c4..4348fde5c4f 100644 --- a/mysql-test/suite/binlog/r/binlog_row_ctype_ucs.result +++ b/mysql-test/suite/binlog/r/binlog_row_ctype_ucs.result @@ -97,7 +97,7 @@ SET @@session.sql_mode=1411383296/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C utf8mb3 *//*!*/; SET @@session.character_set_client=X,@@session.collation_connection=X,@@session.collation_server=X/*!*/; -SET @@session.character_set_collations=''/*!*/; +SET @@session.character_set_collations='utf8mb3=utf8mb3_uca1400_ai_ci,ucs2=ucs2_uca1400_ai_ci,utf8mb4=utf8mb4_uca1400_ai_ci,utf16=utf16_uca1400_ai_ci,utf32=utf32_uca1400_ai_ci'/*!*/; SET @@session.lc_time_names=0/*!*/; SET @@session.collation_database=DEFAULT/*!*/; CREATE TABLE t1 (a VARCHAR(10) CHARACTER SET utf8) diff --git a/mysql-test/suite/binlog/r/binlog_stm_binlog.result b/mysql-test/suite/binlog/r/binlog_stm_binlog.result index 546561bf522..a889e88b764 100644 --- a/mysql-test/suite/binlog/r/binlog_stm_binlog.result +++ b/mysql-test/suite/binlog/r/binlog_stm_binlog.result @@ -335,7 +335,7 @@ DROP TEMPORARY TABLE tmp1; END// CALL p1(); c1 c2 c3 d1 d2 d3 -utf8mb3_general_ci utf8mb3_unicode_ci utf8mb3_unicode_ci 2 2 2 +utf8mb3_uca1400_ai_ci utf8mb3_unicode_ci utf8mb3_unicode_ci 2 2 2 include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Gtid # # GTID #-#-# diff --git a/mysql-test/suite/binlog/r/binlog_stm_ctype_ucs.result b/mysql-test/suite/binlog/r/binlog_stm_ctype_ucs.result index 5f3f75fdb03..d03b9cf75d8 100644 --- a/mysql-test/suite/binlog/r/binlog_stm_ctype_ucs.result +++ b/mysql-test/suite/binlog/r/binlog_stm_ctype_ucs.result @@ -6,7 +6,7 @@ insert into t2 values (@v); include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Gtid # # BEGIN GTID #-#-# -master-bin.000001 # User var # # @`v`=_ucs2 X'006100620063' COLLATE ucs2_general_ci +master-bin.000001 # User var # # @`v`=_ucs2 X'006100620063' COLLATE ucs2_uca1400_ai_ci master-bin.000001 # Query # # use `test`; insert into t2 values (@v) master-bin.000001 # Query # # COMMIT flush logs; @@ -17,7 +17,7 @@ DELIMITER /*!*/; ROLLBACK/*!*/; START TRANSACTION /*!*/; -SET @`v`:=_ucs2 X'006100620063' COLLATE `ucs2_general_ci`/*!*/; +SET @`v`:=_ucs2 X'006100620063' COLLATE `ucs2_uca1400_ai_ci`/*!*/; use `test`/*!*/; SET TIMESTAMP=10000/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; @@ -99,7 +99,7 @@ SET @@session.sql_mode=1411383296/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C utf8mb3 *//*!*/; SET @@session.character_set_client=X,@@session.collation_connection=X,@@session.collation_server=X/*!*/; -SET @@session.character_set_collations=''/*!*/; +SET @@session.character_set_collations='utf8mb3=utf8mb3_uca1400_ai_ci,ucs2=ucs2_uca1400_ai_ci,utf8mb4=utf8mb4_uca1400_ai_ci,utf16=utf16_uca1400_ai_ci,utf32=utf32_uca1400_ai_ci'/*!*/; SET @@session.lc_time_names=0/*!*/; SET @@session.collation_database=DEFAULT/*!*/; CREATE TABLE t1 (a VARCHAR(10) CHARACTER SET utf8) @@ -127,7 +127,7 @@ START TRANSACTION # at # #YYMMDD HH:MM:SS server id # end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid= SET TIMESTAMP=XXX/*!*/; -SET @@session.character_set_collations=''/*!*/; +SET @@session.character_set_collations='utf8mb3=utf8mb3_uca1400_ai_ci,ucs2=ucs2_uca1400_ai_ci,utf8mb4=utf8mb4_uca1400_ai_ci,utf16=utf16_uca1400_ai_ci,utf32=utf32_uca1400_ai_ci'/*!*/; INSERT INTO t1 VALUES ('ä(i2)') /*!*/; # at # @@ -173,7 +173,7 @@ START TRANSACTION # at # #YYMMDD HH:MM:SS server id # end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid= SET TIMESTAMP=XXX/*!*/; -SET @@session.character_set_collations=''/*!*/; +SET @@session.character_set_collations='utf8mb3=utf8mb3_uca1400_ai_ci,ucs2=ucs2_uca1400_ai_ci,utf8mb4=utf8mb4_uca1400_ai_ci,utf16=utf16_uca1400_ai_ci,utf32=utf32_uca1400_ai_ci'/*!*/; INSERT INTO t1 VALUES ('ä(p2)') /*!*/; # at # diff --git a/mysql-test/suite/binlog/r/binlog_table_map_optional_metadata.result b/mysql-test/suite/binlog/r/binlog_table_map_optional_metadata.result index 21275409f36..d3afcdb0c09 100644 --- a/mysql-test/suite/binlog/r/binlog_table_map_optional_metadata.result +++ b/mysql-test/suite/binlog/r/binlog_table_map_optional_metadata.result @@ -94,7 +94,7 @@ INSERT INTO t1(c_char) VALUES("1"); # TINYTEXT CHARSET latin1 COLLATE latin1_swedish_ci, # TEXT CHARSET latin1 COLLATE latin1_swedish_ci, # MEDIUMTEXT CHARSET latin1 COLLATE latin1_swedish_ci, -# LONGTEXT CHARSET utf8mb3 COLLATE utf8mb3_general_ci) +# LONGTEXT CHARSET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci) RESET MASTER; SET GLOBAL binlog_row_metadata = FULL; INSERT INTO t1(c_char) VALUES("1"); @@ -103,7 +103,7 @@ INSERT INTO t1(c_char) VALUES("1"); # `c_tinytext` TINYTEXT CHARSET latin1 COLLATE latin1_swedish_ci, # `c_text` TEXT CHARSET latin1 COLLATE latin1_swedish_ci, # `c_mediumtext` MEDIUMTEXT CHARSET latin1 COLLATE latin1_swedish_ci, -# `c_longtext` LONGTEXT CHARSET utf8mb3 COLLATE utf8mb3_general_ci) +# `c_longtext` LONGTEXT CHARSET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci) DROP TABLE t1; RESET MASTER; # @@ -127,9 +127,9 @@ CREATE TABLE t1(c_char_utf8 CHAR(10) CHARSET utf8, c_varchar_utf8 VARCHAR(10) CHARSET utf8, c_text_utf8 TEXT CHARSET utf8); INSERT INTO t1 VALUES("1", "2", "3"); -# Columns(`c_char_utf8` CHAR(10) CHARSET utf8mb3 COLLATE utf8mb3_general_ci, -# `c_varchar_utf8` VARCHAR(10) CHARSET utf8mb3 COLLATE utf8mb3_general_ci, -# `c_text_utf8` TEXT CHARSET utf8mb3 COLLATE utf8mb3_general_ci) +# Columns(`c_char_utf8` CHAR(10) CHARSET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci, +# `c_varchar_utf8` VARCHAR(10) CHARSET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci, +# `c_text_utf8` TEXT CHARSET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci) DROP TABLE t1; RESET MASTER; CREATE TABLE t1(c_utf8mb4_520 CHAR(10) CHARSET utf8mb4 COLLATE utf8mb4_unicode_ci, @@ -138,7 +138,7 @@ c_utf8mb4_def TEXT CHARSET utf8mb4); INSERT INTO t1 VALUES("1", "2", "3"); # Columns(`c_utf8mb4_520` CHAR(10) CHARSET utf8mb4 COLLATE utf8mb4_unicode_ci, # `c_utf8mb4_0900` VARCHAR(10) CHARSET utf8mb4 COLLATE utf8mb4_polish_ci, -# `c_utf8mb4_def` TEXT CHARSET utf8mb4 COLLATE utf8mb4_general_ci) +# `c_utf8mb4_def` TEXT CHARSET utf8mb4 COLLATE utf8mb4_uca1400_ai_ci) DROP TABLE t1; RESET MASTER; # diff --git a/mysql-test/suite/binlog/r/binlog_table_map_optional_metadata_ucs2.result b/mysql-test/suite/binlog/r/binlog_table_map_optional_metadata_ucs2.result index a889a2fa82e..e085d6ee341 100644 --- a/mysql-test/suite/binlog/r/binlog_table_map_optional_metadata_ucs2.result +++ b/mysql-test/suite/binlog/r/binlog_table_map_optional_metadata_ucs2.result @@ -14,7 +14,7 @@ RESET MASTER; SET GLOBAL binlog_row_metadata = FULL; INSERT INTO t1 VALUES("set1_v1_å", "set2_v2_ä"); # Columns(`c_set_1` SET('set1_v1_','set1_v2_','set1_v3_') CHARSET latin1 COLLATE latin1_swedish_ci, -# `c_set_2` SET('\0s\0e\0t\02\0_\0v\01\0_\0','\0s\0e\0t\02\0_\0v\02\0_\0','\0s\0e\0t\02\0_\0v\03\0_\0') CHARSET ucs2 COLLATE ucs2_general_ci) +# `c_set_2` SET('\0s\0e\0t\02\0_\0v\01\0_\0','\0s\0e\0t\02\0_\0v\02\0_\0','\0s\0e\0t\02\0_\0v\03\0_\0') CHARSET ucs2 COLLATE ucs2_uca1400_ai_ci) INSERT INTO t1 VALUES("set1_v3_ö", "set2_v3_ö"); INSERT INTO t1 VALUES("set1_v1_å", "set2_v1_å"); SELECT c_set_1, HEX(c_set_1) FROM t1; @@ -45,7 +45,7 @@ RESET MASTER; SET GLOBAL binlog_row_metadata = FULL; INSERT INTO t1 VALUES("enum1_v1_å", "enum2_v2_ä"); # Columns(`c_enum_1` ENUM('enum1_v1_','enum1_v2_','enum1_v3_') CHARSET latin1 COLLATE latin1_swedish_ci, -# `c_enum_2` ENUM('\0e\0n\0u\0m\02\0_\0v\01\0_\0','\0e\0n\0u\0m\02\0_\0v\02\0_\0','\0e\0n\0u\0m\02\0_\0v\03\0_\0') CHARSET ucs2 COLLATE ucs2_general_ci) +# `c_enum_2` ENUM('\0e\0n\0u\0m\02\0_\0v\01\0_\0','\0e\0n\0u\0m\02\0_\0v\02\0_\0','\0e\0n\0u\0m\02\0_\0v\03\0_\0') CHARSET ucs2 COLLATE ucs2_uca1400_ai_ci) INSERT INTO t1 VALUES("enum1_v3_ö", "enum2_v3_ö"); INSERT INTO t1 VALUES("enum1_v1_å", "enum2_v1_å"); SELECT c_enum_1, HEX(c_enum_1) FROM t1; diff --git a/mysql-test/suite/binlog/r/binlog_table_map_optional_metadata_utf32.result b/mysql-test/suite/binlog/r/binlog_table_map_optional_metadata_utf32.result index e44d0a275d7..c0555652c23 100644 --- a/mysql-test/suite/binlog/r/binlog_table_map_optional_metadata_utf32.result +++ b/mysql-test/suite/binlog/r/binlog_table_map_optional_metadata_utf32.result @@ -14,7 +14,7 @@ RESET MASTER; SET GLOBAL binlog_row_metadata = FULL; INSERT INTO t1 VALUES("set1_v1_å", "set2_v2_ä"); # Columns(`c_set_1` SET('set1_v1_','set1_v2_','set1_v3_') CHARSET latin1 COLLATE latin1_swedish_ci, -# `c_set_2` SET('\0\0\0s\0\0\0e\0\0\0t\0\0\02\0\0\0_\0\0\0v\0\0\01\0\0\0_\0\0\0','\0\0\0s\0\0\0e\0\0\0t\0\0\02\0\0\0_\0\0\0v\0\0\02\0\0\0_\0\0\0','\0\0\0s\0\0\0e\0\0\0t\0\0\02\0\0\0_\0\0\0v\0\0\03\0\0\0_\0\0\0') CHARSET utf32 COLLATE utf32_general_ci) +# `c_set_2` SET('\0\0\0s\0\0\0e\0\0\0t\0\0\02\0\0\0_\0\0\0v\0\0\01\0\0\0_\0\0\0','\0\0\0s\0\0\0e\0\0\0t\0\0\02\0\0\0_\0\0\0v\0\0\02\0\0\0_\0\0\0','\0\0\0s\0\0\0e\0\0\0t\0\0\02\0\0\0_\0\0\0v\0\0\03\0\0\0_\0\0\0') CHARSET utf32 COLLATE utf32_uca1400_ai_ci) INSERT INTO t1 VALUES("set1_v3_ö", "set2_v3_ö"); INSERT INTO t1 VALUES("set1_v1_å", "set2_v1_å"); SELECT c_set_1, HEX(c_set_1) FROM t1; @@ -45,7 +45,7 @@ RESET MASTER; SET GLOBAL binlog_row_metadata = FULL; INSERT INTO t1 VALUES("enum1_v1_å", "enum2_v2_ä"); # Columns(`c_enum_1` ENUM('enum1_v1_','enum1_v2_','enum1_v3_') CHARSET latin1 COLLATE latin1_swedish_ci, -# `c_enum_2` ENUM('\0\0\0e\0\0\0n\0\0\0u\0\0\0m\0\0\02\0\0\0_\0\0\0v\0\0\01\0\0\0_\0\0\0','\0\0\0e\0\0\0n\0\0\0u\0\0\0m\0\0\02\0\0\0_\0\0\0v\0\0\02\0\0\0_\0\0\0','\0\0\0e\0\0\0n\0\0\0u\0\0\0m\0\0\02\0\0\0_\0\0\0v\0\0\03\0\0\0_\0\0\0') CHARSET utf32 COLLATE utf32_general_ci) +# `c_enum_2` ENUM('\0\0\0e\0\0\0n\0\0\0u\0\0\0m\0\0\02\0\0\0_\0\0\0v\0\0\01\0\0\0_\0\0\0','\0\0\0e\0\0\0n\0\0\0u\0\0\0m\0\0\02\0\0\0_\0\0\0v\0\0\02\0\0\0_\0\0\0','\0\0\0e\0\0\0n\0\0\0u\0\0\0m\0\0\02\0\0\0_\0\0\0v\0\0\03\0\0\0_\0\0\0') CHARSET utf32 COLLATE utf32_uca1400_ai_ci) INSERT INTO t1 VALUES("enum1_v3_ö", "enum2_v3_ö"); INSERT INTO t1 VALUES("enum1_v1_å", "enum2_v1_å"); SELECT c_enum_1, HEX(c_enum_1) FROM t1; diff --git a/mysql-test/suite/compat/oracle/r/column_compression.result b/mysql-test/suite/compat/oracle/r/column_compression.result index 07027a88ba8..8f8406bc955 100644 --- a/mysql-test/suite/compat/oracle/r/column_compression.result +++ b/mysql-test/suite/compat/oracle/r/column_compression.result @@ -76,14 +76,14 @@ CREATE TABLE t1 (a VARCHAR(10) COMPRESSED UNICODE); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" varchar(10) /*!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL + "a" varchar(10) /*!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_uca1400_ai_ci DEFAULT NULL ) DROP TABLE t1; CREATE TABLE t1 (a VARCHAR(10) COMPRESSED CHARACTER SET utf8); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" varchar(10) /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL + "a" varchar(10) /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL ) DROP TABLE t1; # @@ -115,14 +115,14 @@ CREATE TABLE t1 (a VARCHAR(10) COMPRESSED CHARACTER SET utf8 DEFAULT ''); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" varchar(10) /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT '' + "a" varchar(10) /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT '' ) DROP TABLE t1; CREATE TABLE t1 (a VARCHAR(10) COMPRESSED CHARACTER SET utf8 GENERATED ALWAYS AS (REPEAT('a',100))); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" varchar(10) /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci GENERATED ALWAYS AS (repeat('a',100)) VIRTUAL + "a" varchar(10) /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci GENERATED ALWAYS AS (repeat('a',100)) VIRTUAL ) DROP TABLE t1; # @@ -206,14 +206,14 @@ CREATE TABLE t1 (a VARCHAR2(10) COMPRESSED UNICODE); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" varchar(10) /*!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL + "a" varchar(10) /*!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_uca1400_ai_ci DEFAULT NULL ) DROP TABLE t1; CREATE TABLE t1 (a VARCHAR2(10) COMPRESSED CHARACTER SET utf8); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" varchar(10) /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL + "a" varchar(10) /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL ) DROP TABLE t1; # @@ -245,14 +245,14 @@ CREATE TABLE t1 (a VARCHAR2(10) COMPRESSED CHARACTER SET utf8 DEFAULT ''); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" varchar(10) /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT '' + "a" varchar(10) /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT '' ) DROP TABLE t1; CREATE TABLE t1 (a VARCHAR2(10) COMPRESSED CHARACTER SET utf8 GENERATED ALWAYS AS (REPEAT('a',100))); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" varchar(10) /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci GENERATED ALWAYS AS (repeat('a',100)) VIRTUAL + "a" varchar(10) /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci GENERATED ALWAYS AS (repeat('a',100)) VIRTUAL ) DROP TABLE t1; # @@ -336,14 +336,14 @@ CREATE TABLE t1 (a TINYTEXT COMPRESSED UNICODE); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" tinytext /*!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL + "a" tinytext /*!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_uca1400_ai_ci DEFAULT NULL ) DROP TABLE t1; CREATE TABLE t1 (a TINYTEXT COMPRESSED CHARACTER SET utf8); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" tinytext /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL + "a" tinytext /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL ) DROP TABLE t1; # @@ -375,14 +375,14 @@ CREATE TABLE t1 (a TINYTEXT COMPRESSED CHARACTER SET utf8 DEFAULT ''); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" tinytext /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT '' + "a" tinytext /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT '' ) DROP TABLE t1; CREATE TABLE t1 (a TINYTEXT COMPRESSED CHARACTER SET utf8 GENERATED ALWAYS AS (REPEAT('a',100))); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" tinytext /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci GENERATED ALWAYS AS (repeat('a',100)) VIRTUAL + "a" tinytext /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci GENERATED ALWAYS AS (repeat('a',100)) VIRTUAL ) DROP TABLE t1; # @@ -466,14 +466,14 @@ CREATE TABLE t1 (a TEXT COMPRESSED UNICODE); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" text /*!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL + "a" text /*!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_uca1400_ai_ci DEFAULT NULL ) DROP TABLE t1; CREATE TABLE t1 (a TEXT COMPRESSED CHARACTER SET utf8); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" text /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL + "a" text /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL ) DROP TABLE t1; # @@ -505,14 +505,14 @@ CREATE TABLE t1 (a TEXT COMPRESSED CHARACTER SET utf8 DEFAULT ''); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" text /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT '' + "a" text /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT '' ) DROP TABLE t1; CREATE TABLE t1 (a TEXT COMPRESSED CHARACTER SET utf8 GENERATED ALWAYS AS (REPEAT('a',100))); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" text /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci GENERATED ALWAYS AS (repeat('a',100)) VIRTUAL + "a" text /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci GENERATED ALWAYS AS (repeat('a',100)) VIRTUAL ) DROP TABLE t1; # @@ -596,14 +596,14 @@ CREATE TABLE t1 (a MEDIUMTEXT COMPRESSED UNICODE); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" mediumtext /*!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL + "a" mediumtext /*!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_uca1400_ai_ci DEFAULT NULL ) DROP TABLE t1; CREATE TABLE t1 (a MEDIUMTEXT COMPRESSED CHARACTER SET utf8); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" mediumtext /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL + "a" mediumtext /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL ) DROP TABLE t1; # @@ -635,14 +635,14 @@ CREATE TABLE t1 (a MEDIUMTEXT COMPRESSED CHARACTER SET utf8 DEFAULT ''); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" mediumtext /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT '' + "a" mediumtext /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT '' ) DROP TABLE t1; CREATE TABLE t1 (a MEDIUMTEXT COMPRESSED CHARACTER SET utf8 GENERATED ALWAYS AS (REPEAT('a',100))); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" mediumtext /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci GENERATED ALWAYS AS (repeat('a',100)) VIRTUAL + "a" mediumtext /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci GENERATED ALWAYS AS (repeat('a',100)) VIRTUAL ) DROP TABLE t1; # @@ -726,14 +726,14 @@ CREATE TABLE t1 (a LONGTEXT COMPRESSED UNICODE); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" longtext /*!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL + "a" longtext /*!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_uca1400_ai_ci DEFAULT NULL ) DROP TABLE t1; CREATE TABLE t1 (a LONGTEXT COMPRESSED CHARACTER SET utf8); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" longtext /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL + "a" longtext /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL ) DROP TABLE t1; # @@ -765,14 +765,14 @@ CREATE TABLE t1 (a LONGTEXT COMPRESSED CHARACTER SET utf8 DEFAULT ''); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" longtext /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT '' + "a" longtext /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT '' ) DROP TABLE t1; CREATE TABLE t1 (a LONGTEXT COMPRESSED CHARACTER SET utf8 GENERATED ALWAYS AS (REPEAT('a',100))); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" longtext /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci GENERATED ALWAYS AS (repeat('a',100)) VIRTUAL + "a" longtext /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci GENERATED ALWAYS AS (repeat('a',100)) VIRTUAL ) DROP TABLE t1; # @@ -1128,7 +1128,7 @@ CREATE TABLE t1 (a NVARCHAR(10) COMPRESSED); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" varchar(10) /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL + "a" varchar(10) /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL ) DROP TABLE t1; CREATE TABLE t1 (a NVARCHAR(10) COMPRESSED BINARY COMPRESSED); diff --git a/mysql-test/suite/compat/oracle/r/sp-param.result b/mysql-test/suite/compat/oracle/r/sp-param.result index bb415bd74a7..595b8a63938 100644 --- a/mysql-test/suite/compat/oracle/r/sp-param.result +++ b/mysql-test/suite/compat/oracle/r/sp-param.result @@ -21,7 +21,7 @@ DROP FUNCTION f1; CREATE FUNCTION f1(param NCHAR) RETURN NCHAR AS BEGIN RETURN param; END;; SHOW CREATE FUNCTION f1; Function sql_mode Create Function character_set_client collation_connection Database Collation -f1 PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,ORACLE,NO_KEY_OPTIONS,NO_TABLE_OPTIONS,NO_FIELD_OPTIONS,NO_AUTO_CREATE_USER,SIMULTANEOUS_ASSIGNMENT CREATE DEFINER="root"@"localhost" FUNCTION "f1"(param NCHAR) RETURN varchar(2000) CHARSET utf8mb3 COLLATE utf8mb3_general_ci +f1 PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,ORACLE,NO_KEY_OPTIONS,NO_TABLE_OPTIONS,NO_FIELD_OPTIONS,NO_AUTO_CREATE_USER,SIMULTANEOUS_ASSIGNMENT CREATE DEFINER="root"@"localhost" FUNCTION "f1"(param NCHAR) RETURN varchar(2000) CHARSET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci AS BEGIN RETURN param; END latin1 latin1_swedish_ci latin1_swedish_ci SELECT LENGTH(f1(REPEAT('a',2000)));; LENGTH(f1(REPEAT('a',2000))) @@ -30,7 +30,7 @@ CREATE TABLE t1 AS SELECT f1(REPEAT('a',2000)) AS a;; SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" varchar(2000) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL + "a" varchar(2000) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL ) DROP TABLE t1; DROP FUNCTION f1; @@ -85,7 +85,7 @@ DROP FUNCTION f1; CREATE FUNCTION f1(param NVARCHAR) RETURN NVARCHAR AS BEGIN RETURN param; END;; SHOW CREATE FUNCTION f1; Function sql_mode Create Function character_set_client collation_connection Database Collation -f1 PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,ORACLE,NO_KEY_OPTIONS,NO_TABLE_OPTIONS,NO_FIELD_OPTIONS,NO_AUTO_CREATE_USER,SIMULTANEOUS_ASSIGNMENT CREATE DEFINER="root"@"localhost" FUNCTION "f1"(param NVARCHAR) RETURN varchar(4000) CHARSET utf8mb3 COLLATE utf8mb3_general_ci +f1 PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,ORACLE,NO_KEY_OPTIONS,NO_TABLE_OPTIONS,NO_FIELD_OPTIONS,NO_AUTO_CREATE_USER,SIMULTANEOUS_ASSIGNMENT CREATE DEFINER="root"@"localhost" FUNCTION "f1"(param NVARCHAR) RETURN varchar(4000) CHARSET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci AS BEGIN RETURN param; END latin1 latin1_swedish_ci latin1_swedish_ci SELECT LENGTH(f1(REPEAT('a',4000)));; LENGTH(f1(REPEAT('a',4000))) @@ -94,7 +94,7 @@ CREATE TABLE t1 AS SELECT f1(REPEAT('a',4000)) AS a;; SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" varchar(4000) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL + "a" varchar(4000) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL ) DROP TABLE t1; DROP FUNCTION f1; diff --git a/mysql-test/suite/compat/oracle/r/sp-row.result b/mysql-test/suite/compat/oracle/r/sp-row.result index b3a0ae15711..08f803f902c 100644 --- a/mysql-test/suite/compat/oracle/r/sp-row.result +++ b/mysql-test/suite/compat/oracle/r/sp-row.result @@ -822,9 +822,9 @@ CALL p1(); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "rec1.a" varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL, - "rec2.a" varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL, - "rec3.a" varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL + "rec1.a" varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL, + "rec2.a" varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL, + "rec3.a" varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL ) DROP TABLE t1; DROP PROCEDURE p1; @@ -1914,8 +1914,8 @@ CALL p1(); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "var" char(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL, - "rec.var" char(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL + "var" char(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL, + "rec.var" char(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL ) DROP TABLE t1; DROP PROCEDURE p1; @@ -1954,8 +1954,8 @@ CALL p1(); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "var" varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL, - "rec.var" varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL + "var" varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL, + "rec.var" varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL ) DROP TABLE t1; DROP PROCEDURE p1; @@ -2163,8 +2163,8 @@ CALL p1(); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "var" text CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL, - "rec.var" text CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL + "var" text CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL, + "rec.var" text CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL ) DROP TABLE t1; DROP PROCEDURE p1; @@ -2173,8 +2173,8 @@ CALL p1(); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "var" tinytext CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL, - "rec.var" tinytext CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL + "var" tinytext CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL, + "rec.var" tinytext CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL ) DROP TABLE t1; DROP PROCEDURE p1; @@ -2183,8 +2183,8 @@ CALL p1(); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "var" mediumtext CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL, - "rec.var" mediumtext CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL + "var" mediumtext CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL, + "rec.var" mediumtext CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL ) DROP TABLE t1; DROP PROCEDURE p1; @@ -2193,8 +2193,8 @@ CALL p1(); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "var" longtext CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL, - "rec.var" longtext CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL + "var" longtext CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL, + "rec.var" longtext CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL ) DROP TABLE t1; DROP PROCEDURE p1; diff --git a/mysql-test/suite/compat/oracle/r/sp.result b/mysql-test/suite/compat/oracle/r/sp.result index 409ea3b8e3f..56255a444a6 100644 --- a/mysql-test/suite/compat/oracle/r/sp.result +++ b/mysql-test/suite/compat/oracle/r/sp.result @@ -1698,7 +1698,7 @@ t2 CREATE TABLE "t2" ( "dc209" decimal(20,9) DEFAULT NULL, "cc" char(10) DEFAULT NULL, "cv" varchar(10) DEFAULT NULL, - "cvu" varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL, + "cvu" varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL, "t1" tinytext DEFAULT NULL, "t2" text DEFAULT NULL, "t3" mediumtext DEFAULT NULL, @@ -1860,7 +1860,7 @@ t2 CREATE TABLE "t2" ( "dc209" decimal(20,9) DEFAULT NULL, "cc" char(10) DEFAULT NULL, "cv" varchar(10) DEFAULT NULL, - "cvu" varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL, + "cvu" varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL, "t1" tinytext DEFAULT NULL, "t2" text DEFAULT NULL, "t3" mediumtext DEFAULT NULL, diff --git a/mysql-test/suite/engines/funcs/r/db_alter_character_set.result b/mysql-test/suite/engines/funcs/r/db_alter_character_set.result index 252b7d40090..e09e1592e10 100644 --- a/mysql-test/suite/engines/funcs/r/db_alter_character_set.result +++ b/mysql-test/suite/engines/funcs/r/db_alter_character_set.result @@ -22,21 +22,21 @@ cp1250 Windows Central European cp1250_general_ci 1 gbk GBK Simplified Chinese gbk_chinese_ci 2 latin5 ISO 8859-9 Turkish latin5_turkish_ci 1 armscii8 ARMSCII-8 Armenian armscii8_general_ci 1 -utf8mb3 UTF-8 Unicode utf8mb3_general_ci 3 -ucs2 UCS-2 Unicode ucs2_general_ci 2 +utf8mb3 UTF-8 Unicode utf8mb3_uca1400_ai_ci 3 +ucs2 UCS-2 Unicode ucs2_uca1400_ai_ci 2 cp866 DOS Russian cp866_general_ci 1 keybcs2 DOS Kamenicky Czech-Slovak keybcs2_general_ci 1 macce Mac Central European macce_general_ci 1 macroman Mac West European macroman_general_ci 1 cp852 DOS Central European cp852_general_ci 1 latin7 ISO 8859-13 Baltic latin7_general_ci 1 -utf8mb4 UTF-8 Unicode utf8mb4_general_ci 4 +utf8mb4 UTF-8 Unicode utf8mb4_uca1400_ai_ci 4 cp1251 Windows Cyrillic cp1251_general_ci 1 -utf16 UTF-16 Unicode utf16_general_ci 4 +utf16 UTF-16 Unicode utf16_uca1400_ai_ci 4 utf16le UTF-16LE Unicode utf16le_general_ci 4 cp1256 Windows Arabic cp1256_general_ci 1 cp1257 Windows Baltic cp1257_general_ci 1 -utf32 UTF-32 Unicode utf32_general_ci 4 +utf32 UTF-32 Unicode utf32_uca1400_ai_ci 4 binary Binary pseudo charset binary 1 geostd8 GEOSTD8 Georgian geostd8_general_ci 1 cp932 SJIS for Windows Japanese cp932_japanese_ci 2 @@ -75,7 +75,7 @@ def test latin1 latin1_swedish_ci NULL ALTER DATABASE d8 CHARACTER SET utf8; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT -def d8 utf8mb3 utf8mb3_general_ci NULL +def d8 utf8mb3 utf8mb3_uca1400_ai_ci NULL def information_schema utf8mb3 utf8mb3_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL @@ -180,7 +180,7 @@ def test latin1 latin1_swedish_ci NULL ALTER DATABASE d8 DEFAULT CHARACTER SET utf8; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT -def d8 utf8mb3 utf8mb3_general_ci NULL +def d8 utf8mb3 utf8mb3_uca1400_ai_ci NULL def information_schema utf8mb3 utf8mb3_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL @@ -285,7 +285,7 @@ def test latin1 latin1_swedish_ci NULL ALTER SCHEMA d8 CHARACTER SET utf8; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT -def d8 utf8mb3 utf8mb3_general_ci NULL +def d8 utf8mb3 utf8mb3_uca1400_ai_ci NULL def information_schema utf8mb3 utf8mb3_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL @@ -390,7 +390,7 @@ def test latin1 latin1_swedish_ci NULL ALTER SCHEMA d8 DEFAULT CHARACTER SET utf8; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT -def d8 utf8mb3 utf8mb3_general_ci NULL +def d8 utf8mb3 utf8mb3_uca1400_ai_ci NULL def information_schema utf8mb3 utf8mb3_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL diff --git a/mysql-test/suite/engines/funcs/r/db_alter_collate_ascii.result b/mysql-test/suite/engines/funcs/r/db_alter_collate_ascii.result index acb4f1f0e75..d51b7b57d5b 100644 --- a/mysql-test/suite/engines/funcs/r/db_alter_collate_ascii.result +++ b/mysql-test/suite/engines/funcs/r/db_alter_collate_ascii.result @@ -97,7 +97,7 @@ armscii8_general_ci armscii8 32 Yes # # armscii8_bin armscii8 64 # # armscii8_general_nopad_ci armscii8 1056 # # armscii8_nopad_bin armscii8 1088 # # -utf8mb3_general_ci utf8mb3 33 Yes # # +utf8mb3_general_ci utf8mb3 33 # # utf8mb3_bin utf8mb3 83 # # utf8mb3_unicode_ci utf8mb3 192 # # utf8mb3_icelandic_ci utf8mb3 193 # # @@ -132,7 +132,7 @@ utf8mb3_general_nopad_ci utf8mb3 1057 # # utf8mb3_nopad_bin utf8mb3 1107 # # utf8mb3_unicode_nopad_ci utf8mb3 1216 # # utf8mb3_unicode_520_nopad_ci utf8mb3 1238 # # -ucs2_general_ci ucs2 35 Yes # # +ucs2_general_ci ucs2 35 # # ucs2_bin ucs2 90 # # ucs2_unicode_ci ucs2 128 # # ucs2_icelandic_ci ucs2 129 # # @@ -192,7 +192,7 @@ latin7_general_cs latin7 42 # # latin7_bin latin7 79 # # latin7_general_nopad_ci latin7 1065 # # latin7_nopad_bin latin7 1103 # # -utf8mb4_general_ci utf8mb4 45 Yes # # +utf8mb4_general_ci utf8mb4 45 # # utf8mb4_bin utf8mb4 46 # # utf8mb4_unicode_ci utf8mb4 224 # # utf8mb4_icelandic_ci utf8mb4 225 # # @@ -417,7 +417,7 @@ cp1251_general_ci cp1251 51 Yes # # cp1251_general_cs cp1251 52 # # cp1251_nopad_bin cp1251 1074 # # cp1251_general_nopad_ci cp1251 1075 # # -utf16_general_ci utf16 54 Yes # # +utf16_general_ci utf16 54 # # utf16_bin utf16 55 # # utf16_unicode_ci utf16 101 # # utf16_icelandic_ci utf16 102 # # @@ -463,7 +463,7 @@ cp1257_bin cp1257 58 # # cp1257_general_ci cp1257 59 Yes # # cp1257_nopad_bin cp1257 1082 # # cp1257_general_nopad_ci cp1257 1083 # # -utf32_general_ci utf32 60 Yes # # +utf32_general_ci utf32 60 # # utf32_bin utf32 61 # # utf32_unicode_ci utf32 160 # # utf32_icelandic_ci utf32 161 # # diff --git a/mysql-test/suite/engines/funcs/r/db_alter_collate_utf8.result b/mysql-test/suite/engines/funcs/r/db_alter_collate_utf8.result index dc7d62971be..af723291333 100644 --- a/mysql-test/suite/engines/funcs/r/db_alter_collate_utf8.result +++ b/mysql-test/suite/engines/funcs/r/db_alter_collate_utf8.result @@ -97,7 +97,7 @@ armscii8_general_ci armscii8 32 Yes # # armscii8_bin armscii8 64 # # armscii8_general_nopad_ci armscii8 1056 # # armscii8_nopad_bin armscii8 1088 # # -utf8mb3_general_ci utf8mb3 33 Yes # # +utf8mb3_general_ci utf8mb3 33 # # utf8mb3_bin utf8mb3 83 # # utf8mb3_unicode_ci utf8mb3 192 # # utf8mb3_icelandic_ci utf8mb3 193 # # @@ -132,7 +132,7 @@ utf8mb3_general_nopad_ci utf8mb3 1057 # # utf8mb3_nopad_bin utf8mb3 1107 # # utf8mb3_unicode_nopad_ci utf8mb3 1216 # # utf8mb3_unicode_520_nopad_ci utf8mb3 1238 # # -ucs2_general_ci ucs2 35 Yes # # +ucs2_general_ci ucs2 35 # # ucs2_bin ucs2 90 # # ucs2_unicode_ci ucs2 128 # # ucs2_icelandic_ci ucs2 129 # # @@ -192,7 +192,7 @@ latin7_general_cs latin7 42 # # latin7_bin latin7 79 # # latin7_general_nopad_ci latin7 1065 # # latin7_nopad_bin latin7 1103 # # -utf8mb4_general_ci utf8mb4 45 Yes # # +utf8mb4_general_ci utf8mb4 45 # # utf8mb4_bin utf8mb4 46 # # utf8mb4_unicode_ci utf8mb4 224 # # utf8mb4_icelandic_ci utf8mb4 225 # # @@ -417,7 +417,7 @@ cp1251_general_ci cp1251 51 Yes # # cp1251_general_cs cp1251 52 # # cp1251_nopad_bin cp1251 1074 # # cp1251_general_nopad_ci cp1251 1075 # # -utf16_general_ci utf16 54 Yes # # +utf16_general_ci utf16 54 # # utf16_bin utf16 55 # # utf16_unicode_ci utf16 101 # # utf16_icelandic_ci utf16 102 # # @@ -463,7 +463,7 @@ cp1257_bin cp1257 58 # # cp1257_general_ci cp1257 59 Yes # # cp1257_nopad_bin cp1257 1082 # # cp1257_general_nopad_ci cp1257 1083 # # -utf32_general_ci utf32 60 Yes # # +utf32_general_ci utf32 60 # # utf32_bin utf32 61 # # utf32_unicode_ci utf32 160 # # utf32_icelandic_ci utf32 161 # # @@ -512,7 +512,7 @@ eucjpms_nopad_bin eucjpms 1122 # # CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT -def d10 utf8mb3 utf8mb3_general_ci NULL +def d10 utf8mb3 utf8mb3_uca1400_ai_ci NULL def information_schema utf8mb3 utf8mb3_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL @@ -533,7 +533,7 @@ DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT -def d10 utf8mb3 utf8mb3_general_ci NULL +def d10 utf8mb3 utf8mb3_uca1400_ai_ci NULL def information_schema utf8mb3 utf8mb3_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL @@ -554,7 +554,7 @@ DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT -def d10 utf8mb3 utf8mb3_general_ci NULL +def d10 utf8mb3 utf8mb3_uca1400_ai_ci NULL def information_schema utf8mb3 utf8mb3_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL @@ -575,7 +575,7 @@ DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT -def d10 utf8mb3 utf8mb3_general_ci NULL +def d10 utf8mb3 utf8mb3_uca1400_ai_ci NULL def information_schema utf8mb3 utf8mb3_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL @@ -596,7 +596,7 @@ DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT -def d10 utf8mb3 utf8mb3_general_ci NULL +def d10 utf8mb3 utf8mb3_uca1400_ai_ci NULL def information_schema utf8mb3 utf8mb3_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL @@ -617,7 +617,7 @@ DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT -def d10 utf8mb3 utf8mb3_general_ci NULL +def d10 utf8mb3 utf8mb3_uca1400_ai_ci NULL def information_schema utf8mb3 utf8mb3_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL @@ -638,7 +638,7 @@ DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT -def d10 utf8mb3 utf8mb3_general_ci NULL +def d10 utf8mb3 utf8mb3_uca1400_ai_ci NULL def information_schema utf8mb3 utf8mb3_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL @@ -659,7 +659,7 @@ DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT -def d10 utf8mb3 utf8mb3_general_ci NULL +def d10 utf8mb3 utf8mb3_uca1400_ai_ci NULL def information_schema utf8mb3 utf8mb3_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL @@ -680,7 +680,7 @@ DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT -def d10 utf8mb3 utf8mb3_general_ci NULL +def d10 utf8mb3 utf8mb3_uca1400_ai_ci NULL def information_schema utf8mb3 utf8mb3_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL @@ -701,7 +701,7 @@ DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT -def d10 utf8mb3 utf8mb3_general_ci NULL +def d10 utf8mb3 utf8mb3_uca1400_ai_ci NULL def information_schema utf8mb3 utf8mb3_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL @@ -722,7 +722,7 @@ DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT -def d10 utf8mb3 utf8mb3_general_ci NULL +def d10 utf8mb3 utf8mb3_uca1400_ai_ci NULL def information_schema utf8mb3 utf8mb3_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL @@ -743,7 +743,7 @@ DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT -def d10 utf8mb3 utf8mb3_general_ci NULL +def d10 utf8mb3 utf8mb3_uca1400_ai_ci NULL def information_schema utf8mb3 utf8mb3_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL @@ -764,7 +764,7 @@ DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT -def d10 utf8mb3 utf8mb3_general_ci NULL +def d10 utf8mb3 utf8mb3_uca1400_ai_ci NULL def information_schema utf8mb3 utf8mb3_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL @@ -785,7 +785,7 @@ DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT -def d10 utf8mb3 utf8mb3_general_ci NULL +def d10 utf8mb3 utf8mb3_uca1400_ai_ci NULL def information_schema utf8mb3 utf8mb3_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL @@ -806,7 +806,7 @@ DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT -def d10 utf8mb3 utf8mb3_general_ci NULL +def d10 utf8mb3 utf8mb3_uca1400_ai_ci NULL def information_schema utf8mb3 utf8mb3_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL @@ -827,7 +827,7 @@ DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT -def d10 utf8mb3 utf8mb3_general_ci NULL +def d10 utf8mb3 utf8mb3_uca1400_ai_ci NULL def information_schema utf8mb3 utf8mb3_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL @@ -848,7 +848,7 @@ DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT -def d10 utf8mb3 utf8mb3_general_ci NULL +def d10 utf8mb3 utf8mb3_uca1400_ai_ci NULL def information_schema utf8mb3 utf8mb3_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL @@ -869,7 +869,7 @@ DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT -def d10 utf8mb3 utf8mb3_general_ci NULL +def d10 utf8mb3 utf8mb3_uca1400_ai_ci NULL def information_schema utf8mb3 utf8mb3_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL @@ -890,7 +890,7 @@ DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT -def d10 utf8mb3 utf8mb3_general_ci NULL +def d10 utf8mb3 utf8mb3_uca1400_ai_ci NULL def information_schema utf8mb3 utf8mb3_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL @@ -911,7 +911,7 @@ DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT -def d10 utf8mb3 utf8mb3_general_ci NULL +def d10 utf8mb3 utf8mb3_uca1400_ai_ci NULL def information_schema utf8mb3 utf8mb3_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL @@ -932,7 +932,7 @@ DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT -def d10 utf8mb3 utf8mb3_general_ci NULL +def d10 utf8mb3 utf8mb3_uca1400_ai_ci NULL def information_schema utf8mb3 utf8mb3_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL @@ -953,7 +953,7 @@ DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT -def d10 utf8mb3 utf8mb3_general_ci NULL +def d10 utf8mb3 utf8mb3_uca1400_ai_ci NULL def information_schema utf8mb3 utf8mb3_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL @@ -974,7 +974,7 @@ DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT -def d10 utf8mb3 utf8mb3_general_ci NULL +def d10 utf8mb3 utf8mb3_uca1400_ai_ci NULL def information_schema utf8mb3 utf8mb3_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL @@ -995,7 +995,7 @@ DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT -def d10 utf8mb3 utf8mb3_general_ci NULL +def d10 utf8mb3 utf8mb3_uca1400_ai_ci NULL def information_schema utf8mb3 utf8mb3_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL @@ -1016,7 +1016,7 @@ DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT -def d10 utf8mb3 utf8mb3_general_ci NULL +def d10 utf8mb3 utf8mb3_uca1400_ai_ci NULL def information_schema utf8mb3 utf8mb3_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL @@ -1037,7 +1037,7 @@ DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT -def d10 utf8mb3 utf8mb3_general_ci NULL +def d10 utf8mb3 utf8mb3_uca1400_ai_ci NULL def information_schema utf8mb3 utf8mb3_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL @@ -1058,7 +1058,7 @@ DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT -def d10 utf8mb3 utf8mb3_general_ci NULL +def d10 utf8mb3 utf8mb3_uca1400_ai_ci NULL def information_schema utf8mb3 utf8mb3_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL @@ -1079,7 +1079,7 @@ DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT -def d10 utf8mb3 utf8mb3_general_ci NULL +def d10 utf8mb3 utf8mb3_uca1400_ai_ci NULL def information_schema utf8mb3 utf8mb3_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL @@ -1100,7 +1100,7 @@ DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT -def d10 utf8mb3 utf8mb3_general_ci NULL +def d10 utf8mb3 utf8mb3_uca1400_ai_ci NULL def information_schema utf8mb3 utf8mb3_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL @@ -1121,7 +1121,7 @@ DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT -def d10 utf8mb3 utf8mb3_general_ci NULL +def d10 utf8mb3 utf8mb3_uca1400_ai_ci NULL def information_schema utf8mb3 utf8mb3_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL @@ -1142,7 +1142,7 @@ DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT -def d10 utf8mb3 utf8mb3_general_ci NULL +def d10 utf8mb3 utf8mb3_uca1400_ai_ci NULL def information_schema utf8mb3 utf8mb3_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL @@ -1163,7 +1163,7 @@ DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT -def d10 utf8mb3 utf8mb3_general_ci NULL +def d10 utf8mb3 utf8mb3_uca1400_ai_ci NULL def information_schema utf8mb3 utf8mb3_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL @@ -1184,7 +1184,7 @@ DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT -def d10 utf8mb3 utf8mb3_general_ci NULL +def d10 utf8mb3 utf8mb3_uca1400_ai_ci NULL def information_schema utf8mb3 utf8mb3_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL @@ -1205,7 +1205,7 @@ DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT -def d10 utf8mb3 utf8mb3_general_ci NULL +def d10 utf8mb3 utf8mb3_uca1400_ai_ci NULL def information_schema utf8mb3 utf8mb3_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL @@ -1226,7 +1226,7 @@ DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT -def d10 utf8mb3 utf8mb3_general_ci NULL +def d10 utf8mb3 utf8mb3_uca1400_ai_ci NULL def information_schema utf8mb3 utf8mb3_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL @@ -1247,7 +1247,7 @@ DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT -def d10 utf8mb3 utf8mb3_general_ci NULL +def d10 utf8mb3 utf8mb3_uca1400_ai_ci NULL def information_schema utf8mb3 utf8mb3_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL @@ -1268,7 +1268,7 @@ DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT -def d10 utf8mb3 utf8mb3_general_ci NULL +def d10 utf8mb3 utf8mb3_uca1400_ai_ci NULL def information_schema utf8mb3 utf8mb3_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL @@ -1289,7 +1289,7 @@ DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT -def d10 utf8mb3 utf8mb3_general_ci NULL +def d10 utf8mb3 utf8mb3_uca1400_ai_ci NULL def information_schema utf8mb3 utf8mb3_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL @@ -1310,7 +1310,7 @@ DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT -def d10 utf8mb3 utf8mb3_general_ci NULL +def d10 utf8mb3 utf8mb3_uca1400_ai_ci NULL def information_schema utf8mb3 utf8mb3_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL @@ -1331,7 +1331,7 @@ DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT -def d10 utf8mb3 utf8mb3_general_ci NULL +def d10 utf8mb3 utf8mb3_uca1400_ai_ci NULL def information_schema utf8mb3 utf8mb3_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL @@ -1352,7 +1352,7 @@ DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT -def d10 utf8mb3 utf8mb3_general_ci NULL +def d10 utf8mb3 utf8mb3_uca1400_ai_ci NULL def information_schema utf8mb3 utf8mb3_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL @@ -1373,7 +1373,7 @@ DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT -def d10 utf8mb3 utf8mb3_general_ci NULL +def d10 utf8mb3 utf8mb3_uca1400_ai_ci NULL def information_schema utf8mb3 utf8mb3_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL @@ -1394,7 +1394,7 @@ DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT -def d10 utf8mb3 utf8mb3_general_ci NULL +def d10 utf8mb3 utf8mb3_uca1400_ai_ci NULL def information_schema utf8mb3 utf8mb3_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL @@ -1415,7 +1415,7 @@ DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT -def d10 utf8mb3 utf8mb3_general_ci NULL +def d10 utf8mb3 utf8mb3_uca1400_ai_ci NULL def information_schema utf8mb3 utf8mb3_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL @@ -1436,7 +1436,7 @@ DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT -def d10 utf8mb3 utf8mb3_general_ci NULL +def d10 utf8mb3 utf8mb3_uca1400_ai_ci NULL def information_schema utf8mb3 utf8mb3_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL @@ -1457,7 +1457,7 @@ DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT -def d10 utf8mb3 utf8mb3_general_ci NULL +def d10 utf8mb3 utf8mb3_uca1400_ai_ci NULL def information_schema utf8mb3 utf8mb3_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL @@ -1478,7 +1478,7 @@ DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT -def d10 utf8mb3 utf8mb3_general_ci NULL +def d10 utf8mb3 utf8mb3_uca1400_ai_ci NULL def information_schema utf8mb3 utf8mb3_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL @@ -1499,7 +1499,7 @@ DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT -def d10 utf8mb3 utf8mb3_general_ci NULL +def d10 utf8mb3 utf8mb3_uca1400_ai_ci NULL def information_schema utf8mb3 utf8mb3_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL @@ -1520,7 +1520,7 @@ DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT -def d10 utf8mb3 utf8mb3_general_ci NULL +def d10 utf8mb3 utf8mb3_uca1400_ai_ci NULL def information_schema utf8mb3 utf8mb3_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL @@ -1541,7 +1541,7 @@ DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT -def d10 utf8mb3 utf8mb3_general_ci NULL +def d10 utf8mb3 utf8mb3_uca1400_ai_ci NULL def information_schema utf8mb3 utf8mb3_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL @@ -1562,7 +1562,7 @@ DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT -def d10 utf8mb3 utf8mb3_general_ci NULL +def d10 utf8mb3 utf8mb3_uca1400_ai_ci NULL def information_schema utf8mb3 utf8mb3_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL @@ -1583,7 +1583,7 @@ DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT -def d10 utf8mb3 utf8mb3_general_ci NULL +def d10 utf8mb3 utf8mb3_uca1400_ai_ci NULL def information_schema utf8mb3 utf8mb3_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL @@ -1604,7 +1604,7 @@ DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT -def d10 utf8mb3 utf8mb3_general_ci NULL +def d10 utf8mb3 utf8mb3_uca1400_ai_ci NULL def information_schema utf8mb3 utf8mb3_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL @@ -1625,7 +1625,7 @@ DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT -def d10 utf8mb3 utf8mb3_general_ci NULL +def d10 utf8mb3 utf8mb3_uca1400_ai_ci NULL def information_schema utf8mb3 utf8mb3_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL @@ -1646,7 +1646,7 @@ DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT -def d10 utf8mb3 utf8mb3_general_ci NULL +def d10 utf8mb3 utf8mb3_uca1400_ai_ci NULL def information_schema utf8mb3 utf8mb3_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL @@ -1667,7 +1667,7 @@ DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT -def d10 utf8mb3 utf8mb3_general_ci NULL +def d10 utf8mb3 utf8mb3_uca1400_ai_ci NULL def information_schema utf8mb3 utf8mb3_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL @@ -1688,7 +1688,7 @@ DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT -def d10 utf8mb3 utf8mb3_general_ci NULL +def d10 utf8mb3 utf8mb3_uca1400_ai_ci NULL def information_schema utf8mb3 utf8mb3_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL @@ -1709,7 +1709,7 @@ DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT -def d10 utf8mb3 utf8mb3_general_ci NULL +def d10 utf8mb3 utf8mb3_uca1400_ai_ci NULL def information_schema utf8mb3 utf8mb3_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL @@ -1730,7 +1730,7 @@ DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT -def d10 utf8mb3 utf8mb3_general_ci NULL +def d10 utf8mb3 utf8mb3_uca1400_ai_ci NULL def information_schema utf8mb3 utf8mb3_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL @@ -1751,7 +1751,7 @@ DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT -def d10 utf8mb3 utf8mb3_general_ci NULL +def d10 utf8mb3 utf8mb3_uca1400_ai_ci NULL def information_schema utf8mb3 utf8mb3_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL @@ -1772,7 +1772,7 @@ DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT -def d10 utf8mb3 utf8mb3_general_ci NULL +def d10 utf8mb3 utf8mb3_uca1400_ai_ci NULL def information_schema utf8mb3 utf8mb3_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL @@ -1793,7 +1793,7 @@ DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT -def d10 utf8mb3 utf8mb3_general_ci NULL +def d10 utf8mb3 utf8mb3_uca1400_ai_ci NULL def information_schema utf8mb3 utf8mb3_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL @@ -1814,7 +1814,7 @@ DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT -def d10 utf8mb3 utf8mb3_general_ci NULL +def d10 utf8mb3 utf8mb3_uca1400_ai_ci NULL def information_schema utf8mb3 utf8mb3_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL @@ -1835,7 +1835,7 @@ DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT -def d10 utf8mb3 utf8mb3_general_ci NULL +def d10 utf8mb3 utf8mb3_uca1400_ai_ci NULL def information_schema utf8mb3 utf8mb3_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL @@ -1856,7 +1856,7 @@ DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT -def d10 utf8mb3 utf8mb3_general_ci NULL +def d10 utf8mb3 utf8mb3_uca1400_ai_ci NULL def information_schema utf8mb3 utf8mb3_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL @@ -1877,7 +1877,7 @@ DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT -def d10 utf8mb3 utf8mb3_general_ci NULL +def d10 utf8mb3 utf8mb3_uca1400_ai_ci NULL def information_schema utf8mb3 utf8mb3_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL @@ -1898,7 +1898,7 @@ DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT -def d10 utf8mb3 utf8mb3_general_ci NULL +def d10 utf8mb3 utf8mb3_uca1400_ai_ci NULL def information_schema utf8mb3 utf8mb3_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL @@ -1919,7 +1919,7 @@ DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT -def d10 utf8mb3 utf8mb3_general_ci NULL +def d10 utf8mb3 utf8mb3_uca1400_ai_ci NULL def information_schema utf8mb3 utf8mb3_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL @@ -1940,7 +1940,7 @@ DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT -def d10 utf8mb3 utf8mb3_general_ci NULL +def d10 utf8mb3 utf8mb3_uca1400_ai_ci NULL def information_schema utf8mb3 utf8mb3_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL @@ -1961,7 +1961,7 @@ DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT -def d10 utf8mb3 utf8mb3_general_ci NULL +def d10 utf8mb3 utf8mb3_uca1400_ai_ci NULL def information_schema utf8mb3 utf8mb3_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL @@ -1982,7 +1982,7 @@ DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT -def d10 utf8mb3 utf8mb3_general_ci NULL +def d10 utf8mb3 utf8mb3_uca1400_ai_ci NULL def information_schema utf8mb3 utf8mb3_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL @@ -2003,7 +2003,7 @@ DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT -def d10 utf8mb3 utf8mb3_general_ci NULL +def d10 utf8mb3 utf8mb3_uca1400_ai_ci NULL def information_schema utf8mb3 utf8mb3_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL @@ -2024,7 +2024,7 @@ DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT -def d10 utf8mb3 utf8mb3_general_ci NULL +def d10 utf8mb3 utf8mb3_uca1400_ai_ci NULL def information_schema utf8mb3 utf8mb3_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL @@ -2045,7 +2045,7 @@ DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT -def d10 utf8mb3 utf8mb3_general_ci NULL +def d10 utf8mb3 utf8mb3_uca1400_ai_ci NULL def information_schema utf8mb3 utf8mb3_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL @@ -2066,7 +2066,7 @@ DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT -def d10 utf8mb3 utf8mb3_general_ci NULL +def d10 utf8mb3 utf8mb3_uca1400_ai_ci NULL def information_schema utf8mb3 utf8mb3_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL @@ -2087,7 +2087,7 @@ DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT -def d10 utf8mb3 utf8mb3_general_ci NULL +def d10 utf8mb3 utf8mb3_uca1400_ai_ci NULL def information_schema utf8mb3 utf8mb3_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL @@ -2108,7 +2108,7 @@ DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT -def d10 utf8mb3 utf8mb3_general_ci NULL +def d10 utf8mb3 utf8mb3_uca1400_ai_ci NULL def information_schema utf8mb3 utf8mb3_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL @@ -2129,7 +2129,7 @@ DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT -def d10 utf8mb3 utf8mb3_general_ci NULL +def d10 utf8mb3 utf8mb3_uca1400_ai_ci NULL def information_schema utf8mb3 utf8mb3_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL @@ -2150,7 +2150,7 @@ DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT -def d10 utf8mb3 utf8mb3_general_ci NULL +def d10 utf8mb3 utf8mb3_uca1400_ai_ci NULL def information_schema utf8mb3 utf8mb3_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL @@ -2171,7 +2171,7 @@ DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT -def d10 utf8mb3 utf8mb3_general_ci NULL +def d10 utf8mb3 utf8mb3_uca1400_ai_ci NULL def information_schema utf8mb3 utf8mb3_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL @@ -2192,7 +2192,7 @@ DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT -def d10 utf8mb3 utf8mb3_general_ci NULL +def d10 utf8mb3 utf8mb3_uca1400_ai_ci NULL def information_schema utf8mb3 utf8mb3_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL @@ -2213,7 +2213,7 @@ DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT -def d10 utf8mb3 utf8mb3_general_ci NULL +def d10 utf8mb3 utf8mb3_uca1400_ai_ci NULL def information_schema utf8mb3 utf8mb3_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL @@ -2234,7 +2234,7 @@ DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT -def d10 utf8mb3 utf8mb3_general_ci NULL +def d10 utf8mb3 utf8mb3_uca1400_ai_ci NULL def information_schema utf8mb3 utf8mb3_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL @@ -2255,7 +2255,7 @@ DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT -def d10 utf8mb3 utf8mb3_general_ci NULL +def d10 utf8mb3 utf8mb3_uca1400_ai_ci NULL def information_schema utf8mb3 utf8mb3_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL diff --git a/mysql-test/suite/engines/funcs/r/db_create_character_set.result b/mysql-test/suite/engines/funcs/r/db_create_character_set.result index c7386d77168..36c6b8f6f82 100644 --- a/mysql-test/suite/engines/funcs/r/db_create_character_set.result +++ b/mysql-test/suite/engines/funcs/r/db_create_character_set.result @@ -13,7 +13,7 @@ DROP DATABASE d12; CREATE DATABASE d12 CHARACTER SET utf8; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT -def d12 utf8mb3 utf8mb3_general_ci NULL +def d12 utf8mb3 utf8mb3_uca1400_ai_ci NULL def information_schema utf8mb3 utf8mb3_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL @@ -68,7 +68,7 @@ DROP SCHEMA d12; CREATE SCHEMA d12 CHARACTER SET utf8; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT -def d12 utf8mb3 utf8mb3_general_ci NULL +def d12 utf8mb3 utf8mb3_uca1400_ai_ci NULL def information_schema utf8mb3 utf8mb3_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL diff --git a/mysql-test/suite/engines/iuds/r/strings_charsets_update_delete.result b/mysql-test/suite/engines/iuds/r/strings_charsets_update_delete.result index 4b1ffc9045b..bd8af40c324 100644 Binary files a/mysql-test/suite/engines/iuds/r/strings_charsets_update_delete.result and b/mysql-test/suite/engines/iuds/r/strings_charsets_update_delete.result differ diff --git a/mysql-test/suite/events/events_1.result b/mysql-test/suite/events/events_1.result index 2db478ad040..75857b4519f 100644 --- a/mysql-test/suite/events/events_1.result +++ b/mysql-test/suite/events/events_1.result @@ -148,109 +148,109 @@ Warnings: Warning 1105 Event scheduler is switched off, use SET GLOBAL event_scheduler=ON to enable it. SHOW CREATE EVENT root6; Event sql_mode time_zone Create Event character_set_client collation_connection Database Collation -root6 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `root6` ON SCHEDULE EVERY '10:20' MINUTE_SECOND STARTS '#' ON COMPLETION PRESERVE ENABLE COMMENT 'some comment' DO select 1 utf8mb3 utf8mb3_general_ci latin1_swedish_ci +root6 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `root6` ON SCHEDULE EVERY '10:20' MINUTE_SECOND STARTS '#' ON COMPLETION PRESERVE ENABLE COMMENT 'some comment' DO select 1 utf8mb3 utf8mb3_uca1400_ai_ci latin1_swedish_ci create event root7 on schedule every 2 year do select 1; Warnings: Warning 1105 Event scheduler is switched off, use SET GLOBAL event_scheduler=ON to enable it. SHOW CREATE EVENT root7; Event sql_mode time_zone Create Event character_set_client collation_connection Database Collation -root7 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `root7` ON SCHEDULE EVERY 2 YEAR STARTS '#' ON COMPLETION NOT PRESERVE ENABLE DO select 1 utf8mb3 utf8mb3_general_ci latin1_swedish_ci +root7 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `root7` ON SCHEDULE EVERY 2 YEAR STARTS '#' ON COMPLETION NOT PRESERVE ENABLE DO select 1 utf8mb3 utf8mb3_uca1400_ai_ci latin1_swedish_ci create event root8 on schedule every '2:5' year_month do select 1; Warnings: Warning 1105 Event scheduler is switched off, use SET GLOBAL event_scheduler=ON to enable it. SHOW CREATE EVENT root8; Event sql_mode time_zone Create Event character_set_client collation_connection Database Collation -root8 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `root8` ON SCHEDULE EVERY '2-5' YEAR_MONTH STARTS '#' ON COMPLETION NOT PRESERVE ENABLE DO select 1 utf8mb3 utf8mb3_general_ci latin1_swedish_ci +root8 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `root8` ON SCHEDULE EVERY '2-5' YEAR_MONTH STARTS '#' ON COMPLETION NOT PRESERVE ENABLE DO select 1 utf8mb3 utf8mb3_uca1400_ai_ci latin1_swedish_ci create event root8_1 on schedule every '2:15' year_month do select 1; Warnings: Warning 1105 Event scheduler is switched off, use SET GLOBAL event_scheduler=ON to enable it. SHOW CREATE EVENT root8_1; Event sql_mode time_zone Create Event character_set_client collation_connection Database Collation -root8_1 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `root8_1` ON SCHEDULE EVERY '3-3' YEAR_MONTH STARTS '#' ON COMPLETION NOT PRESERVE ENABLE DO select 1 utf8mb3 utf8mb3_general_ci latin1_swedish_ci +root8_1 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `root8_1` ON SCHEDULE EVERY '3-3' YEAR_MONTH STARTS '#' ON COMPLETION NOT PRESERVE ENABLE DO select 1 utf8mb3 utf8mb3_uca1400_ai_ci latin1_swedish_ci create event root9 on schedule every 2 week ON COMPLETION PRESERVE DISABLE COMMENT 'коментар на кирилица' do select 1; Warnings: Warning 1105 Event scheduler is switched off, use SET GLOBAL event_scheduler=ON to enable it. SHOW CREATE EVENT root9; Event sql_mode time_zone Create Event character_set_client collation_connection Database Collation -root9 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `root9` ON SCHEDULE EVERY 2 WEEK STARTS '#' ON COMPLETION PRESERVE DISABLE COMMENT 'коментар на кирилица' DO select 1 utf8mb3 utf8mb3_general_ci latin1_swedish_ci +root9 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `root9` ON SCHEDULE EVERY 2 WEEK STARTS '#' ON COMPLETION PRESERVE DISABLE COMMENT 'коментар на кирилица' DO select 1 utf8mb3 utf8mb3_uca1400_ai_ci latin1_swedish_ci create event root10 on schedule every '20:5' day_hour do select 1; Warnings: Warning 1105 Event scheduler is switched off, use SET GLOBAL event_scheduler=ON to enable it. SHOW CREATE EVENT root10; Event sql_mode time_zone Create Event character_set_client collation_connection Database Collation -root10 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `root10` ON SCHEDULE EVERY '20 5' DAY_HOUR STARTS '#' ON COMPLETION NOT PRESERVE ENABLE DO select 1 utf8mb3 utf8mb3_general_ci latin1_swedish_ci +root10 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `root10` ON SCHEDULE EVERY '20 5' DAY_HOUR STARTS '#' ON COMPLETION NOT PRESERVE ENABLE DO select 1 utf8mb3 utf8mb3_uca1400_ai_ci latin1_swedish_ci create event root11 on schedule every '20:25' day_hour do select 1; Warnings: Warning 1105 Event scheduler is switched off, use SET GLOBAL event_scheduler=ON to enable it. SHOW CREATE EVENT root11; Event sql_mode time_zone Create Event character_set_client collation_connection Database Collation -root11 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `root11` ON SCHEDULE EVERY '21 1' DAY_HOUR STARTS '#' ON COMPLETION NOT PRESERVE ENABLE DO select 1 utf8mb3 utf8mb3_general_ci latin1_swedish_ci +root11 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `root11` ON SCHEDULE EVERY '21 1' DAY_HOUR STARTS '#' ON COMPLETION NOT PRESERVE ENABLE DO select 1 utf8mb3 utf8mb3_uca1400_ai_ci latin1_swedish_ci create event root12 on schedule every '20:25' hour_minute do select 1; Warnings: Warning 1105 Event scheduler is switched off, use SET GLOBAL event_scheduler=ON to enable it. SHOW CREATE EVENT root12; Event sql_mode time_zone Create Event character_set_client collation_connection Database Collation -root12 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `root12` ON SCHEDULE EVERY '20:25' HOUR_MINUTE STARTS '#' ON COMPLETION NOT PRESERVE ENABLE DO select 1 utf8mb3 utf8mb3_general_ci latin1_swedish_ci +root12 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `root12` ON SCHEDULE EVERY '20:25' HOUR_MINUTE STARTS '#' ON COMPLETION NOT PRESERVE ENABLE DO select 1 utf8mb3 utf8mb3_uca1400_ai_ci latin1_swedish_ci create event root13 on schedule every '25:25' hour_minute do select 1; Warnings: Warning 1105 Event scheduler is switched off, use SET GLOBAL event_scheduler=ON to enable it. SHOW CREATE EVENT root13; Event sql_mode time_zone Create Event character_set_client collation_connection Database Collation -root13 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `root13` ON SCHEDULE EVERY '25:25' HOUR_MINUTE STARTS '#' ON COMPLETION NOT PRESERVE ENABLE DO select 1 utf8mb3 utf8mb3_general_ci latin1_swedish_ci +root13 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `root13` ON SCHEDULE EVERY '25:25' HOUR_MINUTE STARTS '#' ON COMPLETION NOT PRESERVE ENABLE DO select 1 utf8mb3 utf8mb3_uca1400_ai_ci latin1_swedish_ci create event root13_1 on schedule every '11:65' hour_minute do select 1; Warnings: Warning 1105 Event scheduler is switched off, use SET GLOBAL event_scheduler=ON to enable it. SHOW CREATE EVENT root13_1; Event sql_mode time_zone Create Event character_set_client collation_connection Database Collation -root13_1 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `root13_1` ON SCHEDULE EVERY '12:5' HOUR_MINUTE STARTS '#' ON COMPLETION NOT PRESERVE ENABLE DO select 1 utf8mb3 utf8mb3_general_ci latin1_swedish_ci +root13_1 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `root13_1` ON SCHEDULE EVERY '12:5' HOUR_MINUTE STARTS '#' ON COMPLETION NOT PRESERVE ENABLE DO select 1 utf8mb3 utf8mb3_uca1400_ai_ci latin1_swedish_ci create event root14 on schedule every '35:35' minute_second do select 1; Warnings: Warning 1105 Event scheduler is switched off, use SET GLOBAL event_scheduler=ON to enable it. SHOW CREATE EVENT root14; Event sql_mode time_zone Create Event character_set_client collation_connection Database Collation -root14 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `root14` ON SCHEDULE EVERY '35:35' MINUTE_SECOND STARTS '#' ON COMPLETION NOT PRESERVE ENABLE DO select 1 utf8mb3 utf8mb3_general_ci latin1_swedish_ci +root14 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `root14` ON SCHEDULE EVERY '35:35' MINUTE_SECOND STARTS '#' ON COMPLETION NOT PRESERVE ENABLE DO select 1 utf8mb3 utf8mb3_uca1400_ai_ci latin1_swedish_ci create event root15 on schedule every '35:66' minute_second do select 1; Warnings: Warning 1105 Event scheduler is switched off, use SET GLOBAL event_scheduler=ON to enable it. SHOW CREATE EVENT root15; Event sql_mode time_zone Create Event character_set_client collation_connection Database Collation -root15 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `root15` ON SCHEDULE EVERY '36:6' MINUTE_SECOND STARTS '#' ON COMPLETION NOT PRESERVE ENABLE DO select 1 utf8mb3 utf8mb3_general_ci latin1_swedish_ci +root15 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `root15` ON SCHEDULE EVERY '36:6' MINUTE_SECOND STARTS '#' ON COMPLETION NOT PRESERVE ENABLE DO select 1 utf8mb3 utf8mb3_uca1400_ai_ci latin1_swedish_ci create event root16 on schedule every '35:56' day_minute do select 1; Warnings: Warning 1105 Event scheduler is switched off, use SET GLOBAL event_scheduler=ON to enable it. SHOW CREATE EVENT root16; Event sql_mode time_zone Create Event character_set_client collation_connection Database Collation -root16 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `root16` ON SCHEDULE EVERY '1 11:56' DAY_MINUTE STARTS '#' ON COMPLETION NOT PRESERVE ENABLE DO select 1 utf8mb3 utf8mb3_general_ci latin1_swedish_ci +root16 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `root16` ON SCHEDULE EVERY '1 11:56' DAY_MINUTE STARTS '#' ON COMPLETION NOT PRESERVE ENABLE DO select 1 utf8mb3 utf8mb3_uca1400_ai_ci latin1_swedish_ci create event root17 on schedule every '35:12:45' day_minute do select 1; Warnings: Warning 1105 Event scheduler is switched off, use SET GLOBAL event_scheduler=ON to enable it. SHOW CREATE EVENT root17; Event sql_mode time_zone Create Event character_set_client collation_connection Database Collation -root17 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `root17` ON SCHEDULE EVERY '35 12:45' DAY_MINUTE STARTS '#' ON COMPLETION NOT PRESERVE ENABLE DO select 1 utf8mb3 utf8mb3_general_ci latin1_swedish_ci +root17 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `root17` ON SCHEDULE EVERY '35 12:45' DAY_MINUTE STARTS '#' ON COMPLETION NOT PRESERVE ENABLE DO select 1 utf8mb3 utf8mb3_uca1400_ai_ci latin1_swedish_ci create event root17_1 on schedule every '35:25:65' day_minute do select 1; Warnings: Warning 1105 Event scheduler is switched off, use SET GLOBAL event_scheduler=ON to enable it. SHOW CREATE EVENT root17_1; Event sql_mode time_zone Create Event character_set_client collation_connection Database Collation -root17_1 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `root17_1` ON SCHEDULE EVERY '36 2:5' DAY_MINUTE STARTS '#' ON COMPLETION NOT PRESERVE ENABLE DO select 1 utf8mb3 utf8mb3_general_ci latin1_swedish_ci +root17_1 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `root17_1` ON SCHEDULE EVERY '36 2:5' DAY_MINUTE STARTS '#' ON COMPLETION NOT PRESERVE ENABLE DO select 1 utf8mb3 utf8mb3_uca1400_ai_ci latin1_swedish_ci create event root18 on schedule every '35:12:45' hour_second do select 1; Warnings: Warning 1105 Event scheduler is switched off, use SET GLOBAL event_scheduler=ON to enable it. SHOW CREATE EVENT root18; Event sql_mode time_zone Create Event character_set_client collation_connection Database Collation -root18 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `root18` ON SCHEDULE EVERY '35:12:45' HOUR_SECOND STARTS '#' ON COMPLETION NOT PRESERVE ENABLE DO select 1 utf8mb3 utf8mb3_general_ci latin1_swedish_ci +root18 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `root18` ON SCHEDULE EVERY '35:12:45' HOUR_SECOND STARTS '#' ON COMPLETION NOT PRESERVE ENABLE DO select 1 utf8mb3 utf8mb3_uca1400_ai_ci latin1_swedish_ci create event root19 on schedule every '15:59:85' hour_second do select 1; Warnings: Warning 1105 Event scheduler is switched off, use SET GLOBAL event_scheduler=ON to enable it. SHOW CREATE EVENT root19; Event sql_mode time_zone Create Event character_set_client collation_connection Database Collation -root19 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `root19` ON SCHEDULE EVERY '16:0:25' HOUR_SECOND STARTS '#' ON COMPLETION NOT PRESERVE ENABLE DO select 1 utf8mb3 utf8mb3_general_ci latin1_swedish_ci +root19 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `root19` ON SCHEDULE EVERY '16:0:25' HOUR_SECOND STARTS '#' ON COMPLETION NOT PRESERVE ENABLE DO select 1 utf8mb3 utf8mb3_uca1400_ai_ci latin1_swedish_ci create event root20 on schedule every '50:20:12:45' day_second do select 1; Warnings: Warning 1105 Event scheduler is switched off, use SET GLOBAL event_scheduler=ON to enable it. SHOW CREATE EVENT root20; Event sql_mode time_zone Create Event character_set_client collation_connection Database Collation -root20 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `root20` ON SCHEDULE EVERY '50 20:12:45' DAY_SECOND STARTS '#' ON COMPLETION NOT PRESERVE ENABLE DO select 1 utf8mb3 utf8mb3_general_ci latin1_swedish_ci +root20 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `root20` ON SCHEDULE EVERY '50 20:12:45' DAY_SECOND STARTS '#' ON COMPLETION NOT PRESERVE ENABLE DO select 1 utf8mb3 utf8mb3_uca1400_ai_ci latin1_swedish_ci set names cp1251; create event 21 on schedule every '50:23:59:95' day_second COMMENT ' 1251 ' do select 1; Warnings: diff --git a/mysql-test/suite/events/events_2.result b/mysql-test/suite/events/events_2.result index 1753fa41ad0..c58fe12029d 100644 --- a/mysql-test/suite/events/events_2.result +++ b/mysql-test/suite/events/events_2.result @@ -145,7 +145,7 @@ Warning 1105 Event scheduler is switched off, use SET GLOBAL event_scheduler=ON lock table t1 read; show create event e1; Event sql_mode time_zone Create Event character_set_client collation_connection Database Collation -e1 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `e1` ON SCHEDULE EVERY 10 HOUR STARTS '#' ON COMPLETION NOT PRESERVE ENABLE DO select 1 utf8mb3 utf8mb3_general_ci latin1_swedish_ci +e1 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `e1` ON SCHEDULE EVERY 10 HOUR STARTS '#' ON COMPLETION NOT PRESERVE ENABLE DO select 1 utf8mb3 utf8mb3_uca1400_ai_ci latin1_swedish_ci select event_name from information_schema.events; event_name e1 @@ -163,7 +163,7 @@ unlock tables; lock table t1 write; show create event e1; Event sql_mode time_zone Create Event character_set_client collation_connection Database Collation -e1 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `e1` ON SCHEDULE EVERY 10 HOUR STARTS '#' ON COMPLETION NOT PRESERVE ENABLE DO select 1 utf8mb3 utf8mb3_general_ci latin1_swedish_ci +e1 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `e1` ON SCHEDULE EVERY 10 HOUR STARTS '#' ON COMPLETION NOT PRESERVE ENABLE DO select 1 utf8mb3 utf8mb3_uca1400_ai_ci latin1_swedish_ci select event_name from information_schema.events; event_name e1 @@ -181,7 +181,7 @@ unlock tables; lock table t1 read, mysql.event read; show create event e1; Event sql_mode time_zone Create Event character_set_client collation_connection Database Collation -e1 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `e1` ON SCHEDULE EVERY 10 HOUR STARTS '#' ON COMPLETION NOT PRESERVE ENABLE DO select 1 utf8mb3 utf8mb3_general_ci latin1_swedish_ci +e1 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `e1` ON SCHEDULE EVERY 10 HOUR STARTS '#' ON COMPLETION NOT PRESERVE ENABLE DO select 1 utf8mb3 utf8mb3_uca1400_ai_ci latin1_swedish_ci select event_name from information_schema.events; event_name e1 @@ -199,7 +199,7 @@ unlock tables; lock table t1 write, mysql.event read; show create event e1; Event sql_mode time_zone Create Event character_set_client collation_connection Database Collation -e1 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `e1` ON SCHEDULE EVERY 10 HOUR STARTS '#' ON COMPLETION NOT PRESERVE ENABLE DO select 1 utf8mb3 utf8mb3_general_ci latin1_swedish_ci +e1 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `e1` ON SCHEDULE EVERY 10 HOUR STARTS '#' ON COMPLETION NOT PRESERVE ENABLE DO select 1 utf8mb3 utf8mb3_uca1400_ai_ci latin1_swedish_ci select event_name from information_schema.events; event_name e1 @@ -221,7 +221,7 @@ ERROR HY000: You can't combine write-locking of system tables with other tables lock table mysql.event write; show create event e1; Event sql_mode time_zone Create Event character_set_client collation_connection Database Collation -e1 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `e1` ON SCHEDULE EVERY 10 HOUR STARTS '#' ON COMPLETION NOT PRESERVE ENABLE DO select 1 utf8mb3 utf8mb3_general_ci latin1_swedish_ci +e1 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `e1` ON SCHEDULE EVERY 10 HOUR STARTS '#' ON COMPLETION NOT PRESERVE ENABLE DO select 1 utf8mb3 utf8mb3_uca1400_ai_ci latin1_swedish_ci select event_name from information_schema.events; event_name e1 diff --git a/mysql-test/suite/funcs_1/r/charset_collation.result b/mysql-test/suite/funcs_1/r/charset_collation.result index c0c36d9e729..a08c0d4a7a3 100644 --- a/mysql-test/suite/funcs_1/r/charset_collation.result +++ b/mysql-test/suite/funcs_1/r/charset_collation.result @@ -9,7 +9,7 @@ ORDER BY character_set_name; CHARACTER_SET_NAME DEFAULT_COLLATE_NAME DESCRIPTION MAXLEN binary binary Binary pseudo charset 1 latin1 latin1_swedish_ci cp1252 West European 1 -utf8mb3 utf8mb3_general_ci UTF-8 Unicode 3 +utf8mb3 utf8mb3_uca1400_ai_ci UTF-8 Unicode 3 SELECT * FROM information_schema.collations @@ -22,7 +22,7 @@ COLLATION_NAME CHARACTER_SET_NAME ID IS_DEFAULT IS_COMPILED SORTLEN latin1_bin latin1 47 Yes 1 latin1_general_ci latin1 48 Yes 1 utf8mb3_bin utf8mb3 83 Yes 1 -utf8mb3_general_ci utf8mb3 33 Yes Yes 1 +utf8mb3_general_ci utf8mb3 33 Yes 1 SELECT * FROM information_schema.collation_character_set_applicability @@ -35,7 +35,7 @@ COLLATION_NAME CHARACTER_SET_NAME FULL_COLLATION_NAME ID IS_DEFAULT latin1_bin latin1 latin1_bin 47 latin1_general_ci latin1 latin1_general_ci 48 utf8mb3_bin utf8mb3 utf8mb3_bin 83 -utf8mb3_general_ci utf8mb3 utf8mb3_general_ci 33 Yes +utf8mb3_general_ci utf8mb3 utf8mb3_general_ci 33 connection default; disconnect con; DROP USER dbdict_test@localhost; diff --git a/mysql-test/suite/funcs_1/r/is_cml_innodb.result b/mysql-test/suite/funcs_1/r/is_cml_innodb.result index 4dce3e10f8b..3dd714859b6 100644 --- a/mysql-test/suite/funcs_1/r/is_cml_innodb.result +++ b/mysql-test/suite/funcs_1/r/is_cml_innodb.result @@ -17,16 +17,16 @@ SELECT * FROM information_schema.columns WHERE table_schema LIKE 'test%' ORDER BY table_schema, table_name, column_name; TABLE_CATALOG TABLE_SCHEMA TABLE_NAME COLUMN_NAME ORDINAL_POSITION COLUMN_DEFAULT IS_NULLABLE DATA_TYPE CHARACTER_MAXIMUM_LENGTH CHARACTER_OCTET_LENGTH NUMERIC_PRECISION NUMERIC_SCALE DATETIME_PRECISION CHARACTER_SET_NAME COLLATION_NAME COLUMN_TYPE COLUMN_KEY EXTRA PRIVILEGES COLUMN_COMMENT IS_GENERATED GENERATION_EXPRESSION IS_SYSTEM_TIME_PERIOD_START IS_SYSTEM_TIME_PERIOD_END -def test t1 f1 1 NULL YES char 1 2 NULL NULL NULL ucs2 ucs2_general_ci char(1) select,insert,update,references NEVER NULL NO NO -def test t1 f10 9 NULL YES mediumtext 8388607 16777215 NULL NULL NULL ucs2 ucs2_general_ci mediumtext select,insert,update,references NEVER NULL NO NO -def test t1 f11 10 NULL YES longtext 2147483647 4294967295 NULL NULL NULL ucs2 ucs2_general_ci longtext select,insert,update,references NEVER NULL NO NO -def test t1 f2 2 NULL YES char 0 0 NULL NULL NULL ucs2 ucs2_general_ci char(0) select,insert,update,references NEVER NULL NO NO -def test t1 f3 3 NULL YES char 10 20 NULL NULL NULL ucs2 ucs2_general_ci char(10) select,insert,update,references NEVER NULL NO NO -def test t1 f5 4 NULL YES varchar 0 0 NULL NULL NULL ucs2 ucs2_general_ci varchar(0) select,insert,update,references NEVER NULL NO NO -def test t1 f6 5 NULL YES varchar 255 510 NULL NULL NULL ucs2 ucs2_general_ci varchar(255) select,insert,update,references NEVER NULL NO NO -def test t1 f7 6 NULL YES varchar 260 520 NULL NULL NULL ucs2 ucs2_general_ci varchar(260) select,insert,update,references NEVER NULL NO NO -def test t1 f8 7 NULL YES text 32767 65535 NULL NULL NULL ucs2 ucs2_general_ci text select,insert,update,references NEVER NULL NO NO -def test t1 f9 8 NULL YES tinytext 127 255 NULL NULL NULL ucs2 ucs2_general_ci tinytext select,insert,update,references NEVER NULL NO NO +def test t1 f1 1 NULL YES char 1 2 NULL NULL NULL ucs2 ucs2_uca1400_ai_ci char(1) select,insert,update,references NEVER NULL NO NO +def test t1 f10 9 NULL YES mediumtext 8388607 16777215 NULL NULL NULL ucs2 ucs2_uca1400_ai_ci mediumtext select,insert,update,references NEVER NULL NO NO +def test t1 f11 10 NULL YES longtext 2147483647 4294967295 NULL NULL NULL ucs2 ucs2_uca1400_ai_ci longtext select,insert,update,references NEVER NULL NO NO +def test t1 f2 2 NULL YES char 0 0 NULL NULL NULL ucs2 ucs2_uca1400_ai_ci char(0) select,insert,update,references NEVER NULL NO NO +def test t1 f3 3 NULL YES char 10 20 NULL NULL NULL ucs2 ucs2_uca1400_ai_ci char(10) select,insert,update,references NEVER NULL NO NO +def test t1 f5 4 NULL YES varchar 0 0 NULL NULL NULL ucs2 ucs2_uca1400_ai_ci varchar(0) select,insert,update,references NEVER NULL NO NO +def test t1 f6 5 NULL YES varchar 255 510 NULL NULL NULL ucs2 ucs2_uca1400_ai_ci varchar(255) select,insert,update,references NEVER NULL NO NO +def test t1 f7 6 NULL YES varchar 260 520 NULL NULL NULL ucs2 ucs2_uca1400_ai_ci varchar(260) select,insert,update,references NEVER NULL NO NO +def test t1 f8 7 NULL YES text 32767 65535 NULL NULL NULL ucs2 ucs2_uca1400_ai_ci text select,insert,update,references NEVER NULL NO NO +def test t1 f9 8 NULL YES tinytext 127 255 NULL NULL NULL ucs2 ucs2_uca1400_ai_ci tinytext select,insert,update,references NEVER NULL NO NO ########################################################################## # Show the quotient of CHARACTER_OCTET_LENGTH and CHARACTER_MAXIMUM_LENGTH ########################################################################## @@ -53,12 +53,12 @@ WHERE table_schema LIKE 'test%' AND CHARACTER_OCTET_LENGTH / CHARACTER_MAXIMUM_LENGTH <> 1 ORDER BY CHARACTER_SET_NAME, COLLATION_NAME, COL_CML; COL_CML DATA_TYPE CHARACTER_SET_NAME COLLATION_NAME -2.0000 char ucs2 ucs2_general_ci -2.0000 longtext ucs2 ucs2_general_ci -2.0000 mediumtext ucs2 ucs2_general_ci -2.0000 text ucs2 ucs2_general_ci -2.0000 varchar ucs2 ucs2_general_ci -2.0079 tinytext ucs2 ucs2_general_ci +2.0000 char ucs2 ucs2_uca1400_ai_ci +2.0000 longtext ucs2 ucs2_uca1400_ai_ci +2.0000 mediumtext ucs2 ucs2_uca1400_ai_ci +2.0000 text ucs2 ucs2_uca1400_ai_ci +2.0000 varchar ucs2 ucs2_uca1400_ai_ci +2.0079 tinytext ucs2 ucs2_uca1400_ai_ci Warnings: Warning 1365 Division by 0 Warning 1365 Division by 0 @@ -72,8 +72,8 @@ WHERE table_schema LIKE 'test%' AND CHARACTER_OCTET_LENGTH / CHARACTER_MAXIMUM_LENGTH IS NULL ORDER BY CHARACTER_SET_NAME, COLLATION_NAME, COL_CML; COL_CML DATA_TYPE CHARACTER_SET_NAME COLLATION_NAME -NULL char ucs2 ucs2_general_ci -NULL varchar ucs2 ucs2_general_ci +NULL char ucs2 ucs2_uca1400_ai_ci +NULL varchar ucs2 ucs2_uca1400_ai_ci Warnings: Warning 1365 Division by 0 Warning 1365 Division by 0 @@ -95,16 +95,16 @@ FROM information_schema.columns WHERE table_schema LIKE 'test%' ORDER BY TABLE_SCHEMA, TABLE_NAME, ORDINAL_POSITION; COL_CML TABLE_SCHEMA TABLE_NAME COLUMN_NAME DATA_TYPE CHARACTER_MAXIMUM_LENGTH CHARACTER_OCTET_LENGTH CHARACTER_SET_NAME COLLATION_NAME COLUMN_TYPE -2.0000 test t1 f1 char 1 2 ucs2 ucs2_general_ci char(1) -NULL test t1 f2 char 0 0 ucs2 ucs2_general_ci char(0) -2.0000 test t1 f3 char 10 20 ucs2 ucs2_general_ci char(10) -NULL test t1 f5 varchar 0 0 ucs2 ucs2_general_ci varchar(0) -2.0000 test t1 f6 varchar 255 510 ucs2 ucs2_general_ci varchar(255) -2.0000 test t1 f7 varchar 260 520 ucs2 ucs2_general_ci varchar(260) -2.0000 test t1 f8 text 32767 65535 ucs2 ucs2_general_ci text -2.0079 test t1 f9 tinytext 127 255 ucs2 ucs2_general_ci tinytext -2.0000 test t1 f10 mediumtext 8388607 16777215 ucs2 ucs2_general_ci mediumtext -2.0000 test t1 f11 longtext 2147483647 4294967295 ucs2 ucs2_general_ci longtext +2.0000 test t1 f1 char 1 2 ucs2 ucs2_uca1400_ai_ci char(1) +NULL test t1 f2 char 0 0 ucs2 ucs2_uca1400_ai_ci char(0) +2.0000 test t1 f3 char 10 20 ucs2 ucs2_uca1400_ai_ci char(10) +NULL test t1 f5 varchar 0 0 ucs2 ucs2_uca1400_ai_ci varchar(0) +2.0000 test t1 f6 varchar 255 510 ucs2 ucs2_uca1400_ai_ci varchar(255) +2.0000 test t1 f7 varchar 260 520 ucs2 ucs2_uca1400_ai_ci varchar(260) +2.0000 test t1 f8 text 32767 65535 ucs2 ucs2_uca1400_ai_ci text +2.0079 test t1 f9 tinytext 127 255 ucs2 ucs2_uca1400_ai_ci tinytext +2.0000 test t1 f10 mediumtext 8388607 16777215 ucs2 ucs2_uca1400_ai_ci mediumtext +2.0000 test t1 f11 longtext 2147483647 4294967295 ucs2 ucs2_uca1400_ai_ci longtext Warnings: Warning 1365 Division by 0 Warning 1365 Division by 0 diff --git a/mysql-test/suite/funcs_1/r/is_cml_memory.result b/mysql-test/suite/funcs_1/r/is_cml_memory.result index abb31f3e5c2..9e009855128 100644 --- a/mysql-test/suite/funcs_1/r/is_cml_memory.result +++ b/mysql-test/suite/funcs_1/r/is_cml_memory.result @@ -14,12 +14,12 @@ SELECT * FROM information_schema.columns WHERE table_schema LIKE 'test%' ORDER BY table_schema, table_name, column_name; TABLE_CATALOG TABLE_SCHEMA TABLE_NAME COLUMN_NAME ORDINAL_POSITION COLUMN_DEFAULT IS_NULLABLE DATA_TYPE CHARACTER_MAXIMUM_LENGTH CHARACTER_OCTET_LENGTH NUMERIC_PRECISION NUMERIC_SCALE DATETIME_PRECISION CHARACTER_SET_NAME COLLATION_NAME COLUMN_TYPE COLUMN_KEY EXTRA PRIVILEGES COLUMN_COMMENT IS_GENERATED GENERATION_EXPRESSION IS_SYSTEM_TIME_PERIOD_START IS_SYSTEM_TIME_PERIOD_END -def test t1 f1 1 NULL YES char 1 2 NULL NULL NULL ucs2 ucs2_general_ci char(1) select,insert,update,references NEVER NULL NO NO -def test t1 f2 2 NULL YES char 0 0 NULL NULL NULL ucs2 ucs2_general_ci char(0) select,insert,update,references NEVER NULL NO NO -def test t1 f3 3 NULL YES char 10 20 NULL NULL NULL ucs2 ucs2_general_ci char(10) select,insert,update,references NEVER NULL NO NO -def test t1 f5 4 NULL YES varchar 0 0 NULL NULL NULL ucs2 ucs2_general_ci varchar(0) select,insert,update,references NEVER NULL NO NO -def test t1 f6 5 NULL YES varchar 255 510 NULL NULL NULL ucs2 ucs2_general_ci varchar(255) select,insert,update,references NEVER NULL NO NO -def test t1 f7 6 NULL YES varchar 260 520 NULL NULL NULL ucs2 ucs2_general_ci varchar(260) select,insert,update,references NEVER NULL NO NO +def test t1 f1 1 NULL YES char 1 2 NULL NULL NULL ucs2 ucs2_uca1400_ai_ci char(1) select,insert,update,references NEVER NULL NO NO +def test t1 f2 2 NULL YES char 0 0 NULL NULL NULL ucs2 ucs2_uca1400_ai_ci char(0) select,insert,update,references NEVER NULL NO NO +def test t1 f3 3 NULL YES char 10 20 NULL NULL NULL ucs2 ucs2_uca1400_ai_ci char(10) select,insert,update,references NEVER NULL NO NO +def test t1 f5 4 NULL YES varchar 0 0 NULL NULL NULL ucs2 ucs2_uca1400_ai_ci varchar(0) select,insert,update,references NEVER NULL NO NO +def test t1 f6 5 NULL YES varchar 255 510 NULL NULL NULL ucs2 ucs2_uca1400_ai_ci varchar(255) select,insert,update,references NEVER NULL NO NO +def test t1 f7 6 NULL YES varchar 260 520 NULL NULL NULL ucs2 ucs2_uca1400_ai_ci varchar(260) select,insert,update,references NEVER NULL NO NO ########################################################################## # Show the quotient of CHARACTER_OCTET_LENGTH and CHARACTER_MAXIMUM_LENGTH ########################################################################## @@ -43,8 +43,8 @@ WHERE table_schema LIKE 'test%' AND CHARACTER_OCTET_LENGTH / CHARACTER_MAXIMUM_LENGTH <> 1 ORDER BY CHARACTER_SET_NAME, COLLATION_NAME, COL_CML; COL_CML DATA_TYPE CHARACTER_SET_NAME COLLATION_NAME -2.0000 char ucs2 ucs2_general_ci -2.0000 varchar ucs2 ucs2_general_ci +2.0000 char ucs2 ucs2_uca1400_ai_ci +2.0000 varchar ucs2 ucs2_uca1400_ai_ci SELECT DISTINCT CHARACTER_OCTET_LENGTH / CHARACTER_MAXIMUM_LENGTH AS COL_CML, DATA_TYPE, @@ -55,8 +55,8 @@ WHERE table_schema LIKE 'test%' AND CHARACTER_OCTET_LENGTH / CHARACTER_MAXIMUM_LENGTH IS NULL ORDER BY CHARACTER_SET_NAME, COLLATION_NAME, COL_CML; COL_CML DATA_TYPE CHARACTER_SET_NAME COLLATION_NAME -NULL char ucs2 ucs2_general_ci -NULL varchar ucs2 ucs2_general_ci +NULL char ucs2 ucs2_uca1400_ai_ci +NULL varchar ucs2 ucs2_uca1400_ai_ci --> CHAR(0) is allowed (see manual), and here both CHARACHTER_* values --> are 0, which is intended behavior, and the result of 0 / 0 IS NULL SELECT CHARACTER_OCTET_LENGTH / CHARACTER_MAXIMUM_LENGTH AS COL_CML, @@ -73,10 +73,10 @@ FROM information_schema.columns WHERE table_schema LIKE 'test%' ORDER BY TABLE_SCHEMA, TABLE_NAME, ORDINAL_POSITION; COL_CML TABLE_SCHEMA TABLE_NAME COLUMN_NAME DATA_TYPE CHARACTER_MAXIMUM_LENGTH CHARACTER_OCTET_LENGTH CHARACTER_SET_NAME COLLATION_NAME COLUMN_TYPE -2.0000 test t1 f1 char 1 2 ucs2 ucs2_general_ci char(1) -NULL test t1 f2 char 0 0 ucs2 ucs2_general_ci char(0) -2.0000 test t1 f3 char 10 20 ucs2 ucs2_general_ci char(10) -NULL test t1 f5 varchar 0 0 ucs2 ucs2_general_ci varchar(0) -2.0000 test t1 f6 varchar 255 510 ucs2 ucs2_general_ci varchar(255) -2.0000 test t1 f7 varchar 260 520 ucs2 ucs2_general_ci varchar(260) +2.0000 test t1 f1 char 1 2 ucs2 ucs2_uca1400_ai_ci char(1) +NULL test t1 f2 char 0 0 ucs2 ucs2_uca1400_ai_ci char(0) +2.0000 test t1 f3 char 10 20 ucs2 ucs2_uca1400_ai_ci char(10) +NULL test t1 f5 varchar 0 0 ucs2 ucs2_uca1400_ai_ci varchar(0) +2.0000 test t1 f6 varchar 255 510 ucs2 ucs2_uca1400_ai_ci varchar(255) +2.0000 test t1 f7 varchar 260 520 ucs2 ucs2_uca1400_ai_ci varchar(260) DROP TABLE t1; diff --git a/mysql-test/suite/funcs_1/r/is_cml_myisam.result b/mysql-test/suite/funcs_1/r/is_cml_myisam.result index 6f3dce02a88..7bc29ea7337 100644 --- a/mysql-test/suite/funcs_1/r/is_cml_myisam.result +++ b/mysql-test/suite/funcs_1/r/is_cml_myisam.result @@ -18,16 +18,16 @@ SELECT * FROM information_schema.columns WHERE table_schema LIKE 'test%' ORDER BY table_schema, table_name, column_name; TABLE_CATALOG TABLE_SCHEMA TABLE_NAME COLUMN_NAME ORDINAL_POSITION COLUMN_DEFAULT IS_NULLABLE DATA_TYPE CHARACTER_MAXIMUM_LENGTH CHARACTER_OCTET_LENGTH NUMERIC_PRECISION NUMERIC_SCALE DATETIME_PRECISION CHARACTER_SET_NAME COLLATION_NAME COLUMN_TYPE COLUMN_KEY EXTRA PRIVILEGES COLUMN_COMMENT IS_GENERATED GENERATION_EXPRESSION IS_SYSTEM_TIME_PERIOD_START IS_SYSTEM_TIME_PERIOD_END -def test t1 f1 1 NULL YES char 1 2 NULL NULL NULL ucs2 ucs2_general_ci char(1) select,insert,update,references NEVER NULL NO NO -def test t1 f10 9 NULL YES mediumtext 8388607 16777215 NULL NULL NULL ucs2 ucs2_general_ci mediumtext select,insert,update,references NEVER NULL NO NO -def test t1 f11 10 NULL YES longtext 2147483647 4294967295 NULL NULL NULL ucs2 ucs2_general_ci longtext select,insert,update,references NEVER NULL NO NO -def test t1 f2 2 NULL YES char 0 0 NULL NULL NULL ucs2 ucs2_general_ci char(0) select,insert,update,references NEVER NULL NO NO -def test t1 f3 3 NULL YES char 10 20 NULL NULL NULL ucs2 ucs2_general_ci char(10) select,insert,update,references NEVER NULL NO NO -def test t1 f5 4 NULL YES varchar 0 0 NULL NULL NULL ucs2 ucs2_general_ci varchar(0) select,insert,update,references NEVER NULL NO NO -def test t1 f6 5 NULL YES varchar 255 510 NULL NULL NULL ucs2 ucs2_general_ci varchar(255) select,insert,update,references NEVER NULL NO NO -def test t1 f7 6 NULL YES varchar 260 520 NULL NULL NULL ucs2 ucs2_general_ci varchar(260) select,insert,update,references NEVER NULL NO NO -def test t1 f8 7 NULL YES text 32767 65535 NULL NULL NULL ucs2 ucs2_general_ci text select,insert,update,references NEVER NULL NO NO -def test t1 f9 8 NULL YES tinytext 127 255 NULL NULL NULL ucs2 ucs2_general_ci tinytext select,insert,update,references NEVER NULL NO NO +def test t1 f1 1 NULL YES char 1 2 NULL NULL NULL ucs2 ucs2_uca1400_ai_ci char(1) select,insert,update,references NEVER NULL NO NO +def test t1 f10 9 NULL YES mediumtext 8388607 16777215 NULL NULL NULL ucs2 ucs2_uca1400_ai_ci mediumtext select,insert,update,references NEVER NULL NO NO +def test t1 f11 10 NULL YES longtext 2147483647 4294967295 NULL NULL NULL ucs2 ucs2_uca1400_ai_ci longtext select,insert,update,references NEVER NULL NO NO +def test t1 f2 2 NULL YES char 0 0 NULL NULL NULL ucs2 ucs2_uca1400_ai_ci char(0) select,insert,update,references NEVER NULL NO NO +def test t1 f3 3 NULL YES char 10 20 NULL NULL NULL ucs2 ucs2_uca1400_ai_ci char(10) select,insert,update,references NEVER NULL NO NO +def test t1 f5 4 NULL YES varchar 0 0 NULL NULL NULL ucs2 ucs2_uca1400_ai_ci varchar(0) select,insert,update,references NEVER NULL NO NO +def test t1 f6 5 NULL YES varchar 255 510 NULL NULL NULL ucs2 ucs2_uca1400_ai_ci varchar(255) select,insert,update,references NEVER NULL NO NO +def test t1 f7 6 NULL YES varchar 260 520 NULL NULL NULL ucs2 ucs2_uca1400_ai_ci varchar(260) select,insert,update,references NEVER NULL NO NO +def test t1 f8 7 NULL YES text 32767 65535 NULL NULL NULL ucs2 ucs2_uca1400_ai_ci text select,insert,update,references NEVER NULL NO NO +def test t1 f9 8 NULL YES tinytext 127 255 NULL NULL NULL ucs2 ucs2_uca1400_ai_ci tinytext select,insert,update,references NEVER NULL NO NO ########################################################################## # Show the quotient of CHARACTER_OCTET_LENGTH and CHARACTER_MAXIMUM_LENGTH ########################################################################## @@ -51,12 +51,12 @@ WHERE table_schema LIKE 'test%' AND CHARACTER_OCTET_LENGTH / CHARACTER_MAXIMUM_LENGTH <> 1 ORDER BY CHARACTER_SET_NAME, COLLATION_NAME, COL_CML; COL_CML DATA_TYPE CHARACTER_SET_NAME COLLATION_NAME -2.0000 char ucs2 ucs2_general_ci -2.0000 longtext ucs2 ucs2_general_ci -2.0000 mediumtext ucs2 ucs2_general_ci -2.0000 text ucs2 ucs2_general_ci -2.0000 varchar ucs2 ucs2_general_ci -2.0079 tinytext ucs2 ucs2_general_ci +2.0000 char ucs2 ucs2_uca1400_ai_ci +2.0000 longtext ucs2 ucs2_uca1400_ai_ci +2.0000 mediumtext ucs2 ucs2_uca1400_ai_ci +2.0000 text ucs2 ucs2_uca1400_ai_ci +2.0000 varchar ucs2 ucs2_uca1400_ai_ci +2.0079 tinytext ucs2 ucs2_uca1400_ai_ci SELECT DISTINCT CHARACTER_OCTET_LENGTH / CHARACTER_MAXIMUM_LENGTH AS COL_CML, DATA_TYPE, @@ -67,8 +67,8 @@ WHERE table_schema LIKE 'test%' AND CHARACTER_OCTET_LENGTH / CHARACTER_MAXIMUM_LENGTH IS NULL ORDER BY CHARACTER_SET_NAME, COLLATION_NAME, COL_CML; COL_CML DATA_TYPE CHARACTER_SET_NAME COLLATION_NAME -NULL char ucs2 ucs2_general_ci -NULL varchar ucs2 ucs2_general_ci +NULL char ucs2 ucs2_uca1400_ai_ci +NULL varchar ucs2 ucs2_uca1400_ai_ci --> CHAR(0) is allowed (see manual), and here both CHARACHTER_* values --> are 0, which is intended behavior, and the result of 0 / 0 IS NULL SELECT CHARACTER_OCTET_LENGTH / CHARACTER_MAXIMUM_LENGTH AS COL_CML, @@ -85,14 +85,14 @@ FROM information_schema.columns WHERE table_schema LIKE 'test%' ORDER BY TABLE_SCHEMA, TABLE_NAME, ORDINAL_POSITION; COL_CML TABLE_SCHEMA TABLE_NAME COLUMN_NAME DATA_TYPE CHARACTER_MAXIMUM_LENGTH CHARACTER_OCTET_LENGTH CHARACTER_SET_NAME COLLATION_NAME COLUMN_TYPE -2.0000 test t1 f1 char 1 2 ucs2 ucs2_general_ci char(1) -NULL test t1 f2 char 0 0 ucs2 ucs2_general_ci char(0) -2.0000 test t1 f3 char 10 20 ucs2 ucs2_general_ci char(10) -NULL test t1 f5 varchar 0 0 ucs2 ucs2_general_ci varchar(0) -2.0000 test t1 f6 varchar 255 510 ucs2 ucs2_general_ci varchar(255) -2.0000 test t1 f7 varchar 260 520 ucs2 ucs2_general_ci varchar(260) -2.0000 test t1 f8 text 32767 65535 ucs2 ucs2_general_ci text -2.0079 test t1 f9 tinytext 127 255 ucs2 ucs2_general_ci tinytext -2.0000 test t1 f10 mediumtext 8388607 16777215 ucs2 ucs2_general_ci mediumtext -2.0000 test t1 f11 longtext 2147483647 4294967295 ucs2 ucs2_general_ci longtext +2.0000 test t1 f1 char 1 2 ucs2 ucs2_uca1400_ai_ci char(1) +NULL test t1 f2 char 0 0 ucs2 ucs2_uca1400_ai_ci char(0) +2.0000 test t1 f3 char 10 20 ucs2 ucs2_uca1400_ai_ci char(10) +NULL test t1 f5 varchar 0 0 ucs2 ucs2_uca1400_ai_ci varchar(0) +2.0000 test t1 f6 varchar 255 510 ucs2 ucs2_uca1400_ai_ci varchar(255) +2.0000 test t1 f7 varchar 260 520 ucs2 ucs2_uca1400_ai_ci varchar(260) +2.0000 test t1 f8 text 32767 65535 ucs2 ucs2_uca1400_ai_ci text +2.0079 test t1 f9 tinytext 127 255 ucs2 ucs2_uca1400_ai_ci tinytext +2.0000 test t1 f10 mediumtext 8388607 16777215 ucs2 ucs2_uca1400_ai_ci mediumtext +2.0000 test t1 f11 longtext 2147483647 4294967295 ucs2 ucs2_uca1400_ai_ci longtext DROP TABLE t1; diff --git a/mysql-test/suite/funcs_1/r/is_tables.result b/mysql-test/suite/funcs_1/r/is_tables.result index 67bbb0aede5..762f5ca2057 100644 --- a/mysql-test/suite/funcs_1/r/is_tables.result +++ b/mysql-test/suite/funcs_1/r/is_tables.result @@ -268,11 +268,11 @@ ALTER TABLE db_datadict.t1_my_tablex DEFAULT CHARACTER SET utf8; SELECT table_name, table_collation FROM information_schema.tables WHERE table_name = 't1_my_tablex'; table_name table_collation -t1_my_tablex utf8mb3_general_ci +t1_my_tablex utf8mb3_uca1400_ai_ci SELECT table_name, table_collation FROM information_schema.tables WHERE table_name = 't1_my_tablex'; table_name table_collation -t1_my_tablex utf8mb3_general_ci +t1_my_tablex utf8mb3_uca1400_ai_ci ALTER TABLE db_datadict.t1_my_tablex DEFAULT CHARACTER SET latin1 COLLATE latin1_german1_ci; SELECT table_name, table_collation FROM information_schema.tables diff --git a/mysql-test/suite/funcs_1/r/is_tables_embedded.result b/mysql-test/suite/funcs_1/r/is_tables_embedded.result index 4761ed8deca..73df88318bd 100644 --- a/mysql-test/suite/funcs_1/r/is_tables_embedded.result +++ b/mysql-test/suite/funcs_1/r/is_tables_embedded.result @@ -276,11 +276,11 @@ ALTER TABLE db_datadict.t1_my_tablex DEFAULT CHARACTER SET utf8; SELECT table_name, table_collation FROM information_schema.tables WHERE table_name = 't1_my_tablex'; table_name table_collation -t1_my_tablex utf8mb3_general_ci +t1_my_tablex utf8mb3_uca1400_ai_ci SELECT table_name, table_collation FROM information_schema.tables WHERE table_name = 't1_my_tablex'; table_name table_collation -t1_my_tablex utf8mb3_general_ci +t1_my_tablex utf8mb3_uca1400_ai_ci ALTER TABLE db_datadict.t1_my_tablex DEFAULT CHARACTER SET latin1 COLLATE latin1_german1_ci; SELECT table_name, table_collation FROM information_schema.tables diff --git a/mysql-test/suite/funcs_2/r/innodb_charset.result b/mysql-test/suite/funcs_2/r/innodb_charset.result index 399fc1d9fe7..08379481bc1 100644 --- a/mysql-test/suite/funcs_2/r/innodb_charset.result +++ b/mysql-test/suite/funcs_2/r/innodb_charset.result @@ -17564,7 +17564,7 @@ SET NAMES utf8; CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8) ENGINE=InnoDB CHARACTER SET utf8; SHOW TABLE STATUS LIKE 't1'; Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment Max_index_length Temporary -t1 InnoDB # # # # # # # # # # # # utf8mb3_general_ci # # # 0 N +t1 InnoDB # # # # # # # # # # # # utf8mb3_uca1400_ai_ci # # # 0 N LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1; ALTER TABLE test.t1 CHANGE a a CHAR(4) CHARACTER SET ucs2 COLLATE ucs2_bin; @@ -20105,7 +20105,7 @@ SET NAMES utf8; CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8) ENGINE=InnoDB CHARACTER SET utf8; SHOW TABLE STATUS LIKE 't1'; Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment Max_index_length Temporary -t1 InnoDB # # # # # # # # # # # # utf8mb3_general_ci # # # 0 N +t1 InnoDB # # # # # # # # # # # # utf8mb3_uca1400_ai_ci # # # 0 N LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1; ALTER TABLE test.t1 CHANGE a a CHAR(4) CHARACTER SET ucs2 COLLATE ucs2_czech_ci; @@ -22646,7 +22646,7 @@ SET NAMES utf8; CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8) ENGINE=InnoDB CHARACTER SET utf8; SHOW TABLE STATUS LIKE 't1'; Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment Max_index_length Temporary -t1 InnoDB # # # # # # # # # # # # utf8mb3_general_ci # # # 0 N +t1 InnoDB # # # # # # # # # # # # utf8mb3_uca1400_ai_ci # # # 0 N LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1; ALTER TABLE test.t1 CHANGE a a CHAR(4) CHARACTER SET ucs2 COLLATE ucs2_danish_ci; @@ -25187,7 +25187,7 @@ SET NAMES utf8; CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8) ENGINE=InnoDB CHARACTER SET utf8; SHOW TABLE STATUS LIKE 't1'; Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment Max_index_length Temporary -t1 InnoDB # # # # # # # # # # # # utf8mb3_general_ci # # # 0 N +t1 InnoDB # # # # # # # # # # # # utf8mb3_uca1400_ai_ci # # # 0 N LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1; ALTER TABLE test.t1 CHANGE a a CHAR(4) CHARACTER SET ucs2 COLLATE ucs2_estonian_ci; @@ -27728,7 +27728,7 @@ SET NAMES utf8; CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8) ENGINE=InnoDB CHARACTER SET utf8; SHOW TABLE STATUS LIKE 't1'; Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment Max_index_length Temporary -t1 InnoDB # # # # # # # # # # # # utf8mb3_general_ci # # # 0 N +t1 InnoDB # # # # # # # # # # # # utf8mb3_uca1400_ai_ci # # # 0 N LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1; ALTER TABLE test.t1 CHANGE a a CHAR(4) CHARACTER SET ucs2 COLLATE ucs2_general_ci; @@ -30269,7 +30269,7 @@ SET NAMES utf8; CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8) ENGINE=InnoDB CHARACTER SET utf8; SHOW TABLE STATUS LIKE 't1'; Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment Max_index_length Temporary -t1 InnoDB # # # # # # # # # # # # utf8mb3_general_ci # # # 0 N +t1 InnoDB # # # # # # # # # # # # utf8mb3_uca1400_ai_ci # # # 0 N LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1; ALTER TABLE test.t1 CHANGE a a CHAR(4) CHARACTER SET ucs2 COLLATE ucs2_hungarian_ci; @@ -32810,7 +32810,7 @@ SET NAMES utf8; CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8) ENGINE=InnoDB CHARACTER SET utf8; SHOW TABLE STATUS LIKE 't1'; Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment Max_index_length Temporary -t1 InnoDB # # # # # # # # # # # # utf8mb3_general_ci # # # 0 N +t1 InnoDB # # # # # # # # # # # # utf8mb3_uca1400_ai_ci # # # 0 N LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1; ALTER TABLE test.t1 CHANGE a a CHAR(4) CHARACTER SET ucs2 COLLATE ucs2_icelandic_ci; @@ -35351,7 +35351,7 @@ SET NAMES utf8; CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8) ENGINE=InnoDB CHARACTER SET utf8; SHOW TABLE STATUS LIKE 't1'; Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment Max_index_length Temporary -t1 InnoDB # # # # # # # # # # # # utf8mb3_general_ci # # # 0 N +t1 InnoDB # # # # # # # # # # # # utf8mb3_uca1400_ai_ci # # # 0 N LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1; ALTER TABLE test.t1 CHANGE a a CHAR(4) CHARACTER SET ucs2 COLLATE ucs2_latvian_ci; @@ -37892,7 +37892,7 @@ SET NAMES utf8; CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8) ENGINE=InnoDB CHARACTER SET utf8; SHOW TABLE STATUS LIKE 't1'; Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment Max_index_length Temporary -t1 InnoDB # # # # # # # # # # # # utf8mb3_general_ci # # # 0 N +t1 InnoDB # # # # # # # # # # # # utf8mb3_uca1400_ai_ci # # # 0 N LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1; ALTER TABLE test.t1 CHANGE a a CHAR(4) CHARACTER SET ucs2 COLLATE ucs2_lithuanian_ci; @@ -40433,7 +40433,7 @@ SET NAMES utf8; CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8) ENGINE=InnoDB CHARACTER SET utf8; SHOW TABLE STATUS LIKE 't1'; Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment Max_index_length Temporary -t1 InnoDB # # # # # # # # # # # # utf8mb3_general_ci # # # 0 N +t1 InnoDB # # # # # # # # # # # # utf8mb3_uca1400_ai_ci # # # 0 N LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1; ALTER TABLE test.t1 CHANGE a a CHAR(4) CHARACTER SET ucs2 COLLATE ucs2_persian_ci; @@ -42974,7 +42974,7 @@ SET NAMES utf8; CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8) ENGINE=InnoDB CHARACTER SET utf8; SHOW TABLE STATUS LIKE 't1'; Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment Max_index_length Temporary -t1 InnoDB # # # # # # # # # # # # utf8mb3_general_ci # # # 0 N +t1 InnoDB # # # # # # # # # # # # utf8mb3_uca1400_ai_ci # # # 0 N LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1; ALTER TABLE test.t1 CHANGE a a CHAR(4) CHARACTER SET ucs2 COLLATE ucs2_polish_ci; @@ -45515,7 +45515,7 @@ SET NAMES utf8; CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8) ENGINE=InnoDB CHARACTER SET utf8; SHOW TABLE STATUS LIKE 't1'; Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment Max_index_length Temporary -t1 InnoDB # # # # # # # # # # # # utf8mb3_general_ci # # # 0 N +t1 InnoDB # # # # # # # # # # # # utf8mb3_uca1400_ai_ci # # # 0 N LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1; ALTER TABLE test.t1 CHANGE a a CHAR(4) CHARACTER SET ucs2 COLLATE ucs2_roman_ci; @@ -48056,7 +48056,7 @@ SET NAMES utf8; CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8) ENGINE=InnoDB CHARACTER SET utf8; SHOW TABLE STATUS LIKE 't1'; Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment Max_index_length Temporary -t1 InnoDB # # # # # # # # # # # # utf8mb3_general_ci # # # 0 N +t1 InnoDB # # # # # # # # # # # # utf8mb3_uca1400_ai_ci # # # 0 N LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1; ALTER TABLE test.t1 CHANGE a a CHAR(4) CHARACTER SET ucs2 COLLATE ucs2_romanian_ci; @@ -50597,7 +50597,7 @@ SET NAMES utf8; CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8) ENGINE=InnoDB CHARACTER SET utf8; SHOW TABLE STATUS LIKE 't1'; Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment Max_index_length Temporary -t1 InnoDB # # # # # # # # # # # # utf8mb3_general_ci # # # 0 N +t1 InnoDB # # # # # # # # # # # # utf8mb3_uca1400_ai_ci # # # 0 N LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1; ALTER TABLE test.t1 CHANGE a a CHAR(4) CHARACTER SET ucs2 COLLATE ucs2_slovak_ci; @@ -53138,7 +53138,7 @@ SET NAMES utf8; CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8) ENGINE=InnoDB CHARACTER SET utf8; SHOW TABLE STATUS LIKE 't1'; Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment Max_index_length Temporary -t1 InnoDB # # # # # # # # # # # # utf8mb3_general_ci # # # 0 N +t1 InnoDB # # # # # # # # # # # # utf8mb3_uca1400_ai_ci # # # 0 N LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1; ALTER TABLE test.t1 CHANGE a a CHAR(4) CHARACTER SET ucs2 COLLATE ucs2_slovenian_ci; @@ -55679,7 +55679,7 @@ SET NAMES utf8; CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8) ENGINE=InnoDB CHARACTER SET utf8; SHOW TABLE STATUS LIKE 't1'; Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment Max_index_length Temporary -t1 InnoDB # # # # # # # # # # # # utf8mb3_general_ci # # # 0 N +t1 InnoDB # # # # # # # # # # # # utf8mb3_uca1400_ai_ci # # # 0 N LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1; ALTER TABLE test.t1 CHANGE a a CHAR(4) CHARACTER SET ucs2 COLLATE ucs2_spanish2_ci; @@ -58220,7 +58220,7 @@ SET NAMES utf8; CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8) ENGINE=InnoDB CHARACTER SET utf8; SHOW TABLE STATUS LIKE 't1'; Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment Max_index_length Temporary -t1 InnoDB # # # # # # # # # # # # utf8mb3_general_ci # # # 0 N +t1 InnoDB # # # # # # # # # # # # utf8mb3_uca1400_ai_ci # # # 0 N LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1; ALTER TABLE test.t1 CHANGE a a CHAR(4) CHARACTER SET ucs2 COLLATE ucs2_spanish_ci; @@ -60761,7 +60761,7 @@ SET NAMES utf8; CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8) ENGINE=InnoDB CHARACTER SET utf8; SHOW TABLE STATUS LIKE 't1'; Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment Max_index_length Temporary -t1 InnoDB # # # # # # # # # # # # utf8mb3_general_ci # # # 0 N +t1 InnoDB # # # # # # # # # # # # utf8mb3_uca1400_ai_ci # # # 0 N LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1; ALTER TABLE test.t1 CHANGE a a CHAR(4) CHARACTER SET ucs2 COLLATE ucs2_swedish_ci; @@ -63302,7 +63302,7 @@ SET NAMES utf8; CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8) ENGINE=InnoDB CHARACTER SET utf8; SHOW TABLE STATUS LIKE 't1'; Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment Max_index_length Temporary -t1 InnoDB # # # # # # # # # # # # utf8mb3_general_ci # # # 0 N +t1 InnoDB # # # # # # # # # # # # utf8mb3_uca1400_ai_ci # # # 0 N LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1; ALTER TABLE test.t1 CHANGE a a CHAR(4) CHARACTER SET ucs2 COLLATE ucs2_turkish_ci; @@ -65843,7 +65843,7 @@ SET NAMES utf8; CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8) ENGINE=InnoDB CHARACTER SET utf8; SHOW TABLE STATUS LIKE 't1'; Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment Max_index_length Temporary -t1 InnoDB # # # # # # # # # # # # utf8mb3_general_ci # # # 0 N +t1 InnoDB # # # # # # # # # # # # utf8mb3_uca1400_ai_ci # # # 0 N LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1; ALTER TABLE test.t1 CHANGE a a CHAR(4) CHARACTER SET ucs2 COLLATE ucs2_unicode_ci; diff --git a/mysql-test/suite/funcs_2/r/memory_charset.result b/mysql-test/suite/funcs_2/r/memory_charset.result index bf21eac2a53..a15d1e81591 100644 --- a/mysql-test/suite/funcs_2/r/memory_charset.result +++ b/mysql-test/suite/funcs_2/r/memory_charset.result @@ -17563,7 +17563,7 @@ SET NAMES utf8; CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8) ENGINE=Memory CHARACTER SET utf8; SHOW TABLE STATUS LIKE 't1'; Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment Max_index_length Temporary -t1 MEMORY # # # # # # # # # # # # utf8mb3_general_ci # # # 0 N +t1 MEMORY # # # # # # # # # # # # utf8mb3_uca1400_ai_ci # # # 0 N LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1; ALTER TABLE test.t1 CHANGE a a CHAR(4) CHARACTER SET ucs2 COLLATE ucs2_bin; @@ -20104,7 +20104,7 @@ SET NAMES utf8; CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8) ENGINE=Memory CHARACTER SET utf8; SHOW TABLE STATUS LIKE 't1'; Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment Max_index_length Temporary -t1 MEMORY # # # # # # # # # # # # utf8mb3_general_ci # # # 0 N +t1 MEMORY # # # # # # # # # # # # utf8mb3_uca1400_ai_ci # # # 0 N LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1; ALTER TABLE test.t1 CHANGE a a CHAR(4) CHARACTER SET ucs2 COLLATE ucs2_czech_ci; @@ -22645,7 +22645,7 @@ SET NAMES utf8; CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8) ENGINE=Memory CHARACTER SET utf8; SHOW TABLE STATUS LIKE 't1'; Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment Max_index_length Temporary -t1 MEMORY # # # # # # # # # # # # utf8mb3_general_ci # # # 0 N +t1 MEMORY # # # # # # # # # # # # utf8mb3_uca1400_ai_ci # # # 0 N LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1; ALTER TABLE test.t1 CHANGE a a CHAR(4) CHARACTER SET ucs2 COLLATE ucs2_danish_ci; @@ -25186,7 +25186,7 @@ SET NAMES utf8; CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8) ENGINE=Memory CHARACTER SET utf8; SHOW TABLE STATUS LIKE 't1'; Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment Max_index_length Temporary -t1 MEMORY # # # # # # # # # # # # utf8mb3_general_ci # # # 0 N +t1 MEMORY # # # # # # # # # # # # utf8mb3_uca1400_ai_ci # # # 0 N LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1; ALTER TABLE test.t1 CHANGE a a CHAR(4) CHARACTER SET ucs2 COLLATE ucs2_estonian_ci; @@ -27727,7 +27727,7 @@ SET NAMES utf8; CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8) ENGINE=Memory CHARACTER SET utf8; SHOW TABLE STATUS LIKE 't1'; Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment Max_index_length Temporary -t1 MEMORY # # # # # # # # # # # # utf8mb3_general_ci # # # 0 N +t1 MEMORY # # # # # # # # # # # # utf8mb3_uca1400_ai_ci # # # 0 N LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1; ALTER TABLE test.t1 CHANGE a a CHAR(4) CHARACTER SET ucs2 COLLATE ucs2_general_ci; @@ -30268,7 +30268,7 @@ SET NAMES utf8; CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8) ENGINE=Memory CHARACTER SET utf8; SHOW TABLE STATUS LIKE 't1'; Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment Max_index_length Temporary -t1 MEMORY # # # # # # # # # # # # utf8mb3_general_ci # # # 0 N +t1 MEMORY # # # # # # # # # # # # utf8mb3_uca1400_ai_ci # # # 0 N LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1; ALTER TABLE test.t1 CHANGE a a CHAR(4) CHARACTER SET ucs2 COLLATE ucs2_hungarian_ci; @@ -32809,7 +32809,7 @@ SET NAMES utf8; CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8) ENGINE=Memory CHARACTER SET utf8; SHOW TABLE STATUS LIKE 't1'; Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment Max_index_length Temporary -t1 MEMORY # # # # # # # # # # # # utf8mb3_general_ci # # # 0 N +t1 MEMORY # # # # # # # # # # # # utf8mb3_uca1400_ai_ci # # # 0 N LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1; ALTER TABLE test.t1 CHANGE a a CHAR(4) CHARACTER SET ucs2 COLLATE ucs2_icelandic_ci; @@ -35350,7 +35350,7 @@ SET NAMES utf8; CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8) ENGINE=Memory CHARACTER SET utf8; SHOW TABLE STATUS LIKE 't1'; Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment Max_index_length Temporary -t1 MEMORY # # # # # # # # # # # # utf8mb3_general_ci # # # 0 N +t1 MEMORY # # # # # # # # # # # # utf8mb3_uca1400_ai_ci # # # 0 N LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1; ALTER TABLE test.t1 CHANGE a a CHAR(4) CHARACTER SET ucs2 COLLATE ucs2_latvian_ci; @@ -37891,7 +37891,7 @@ SET NAMES utf8; CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8) ENGINE=Memory CHARACTER SET utf8; SHOW TABLE STATUS LIKE 't1'; Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment Max_index_length Temporary -t1 MEMORY # # # # # # # # # # # # utf8mb3_general_ci # # # 0 N +t1 MEMORY # # # # # # # # # # # # utf8mb3_uca1400_ai_ci # # # 0 N LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1; ALTER TABLE test.t1 CHANGE a a CHAR(4) CHARACTER SET ucs2 COLLATE ucs2_lithuanian_ci; @@ -40432,7 +40432,7 @@ SET NAMES utf8; CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8) ENGINE=Memory CHARACTER SET utf8; SHOW TABLE STATUS LIKE 't1'; Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment Max_index_length Temporary -t1 MEMORY # # # # # # # # # # # # utf8mb3_general_ci # # # 0 N +t1 MEMORY # # # # # # # # # # # # utf8mb3_uca1400_ai_ci # # # 0 N LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1; ALTER TABLE test.t1 CHANGE a a CHAR(4) CHARACTER SET ucs2 COLLATE ucs2_persian_ci; @@ -42973,7 +42973,7 @@ SET NAMES utf8; CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8) ENGINE=Memory CHARACTER SET utf8; SHOW TABLE STATUS LIKE 't1'; Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment Max_index_length Temporary -t1 MEMORY # # # # # # # # # # # # utf8mb3_general_ci # # # 0 N +t1 MEMORY # # # # # # # # # # # # utf8mb3_uca1400_ai_ci # # # 0 N LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1; ALTER TABLE test.t1 CHANGE a a CHAR(4) CHARACTER SET ucs2 COLLATE ucs2_polish_ci; @@ -45514,7 +45514,7 @@ SET NAMES utf8; CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8) ENGINE=Memory CHARACTER SET utf8; SHOW TABLE STATUS LIKE 't1'; Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment Max_index_length Temporary -t1 MEMORY # # # # # # # # # # # # utf8mb3_general_ci # # # 0 N +t1 MEMORY # # # # # # # # # # # # utf8mb3_uca1400_ai_ci # # # 0 N LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1; ALTER TABLE test.t1 CHANGE a a CHAR(4) CHARACTER SET ucs2 COLLATE ucs2_roman_ci; @@ -48055,7 +48055,7 @@ SET NAMES utf8; CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8) ENGINE=Memory CHARACTER SET utf8; SHOW TABLE STATUS LIKE 't1'; Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment Max_index_length Temporary -t1 MEMORY # # # # # # # # # # # # utf8mb3_general_ci # # # 0 N +t1 MEMORY # # # # # # # # # # # # utf8mb3_uca1400_ai_ci # # # 0 N LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1; ALTER TABLE test.t1 CHANGE a a CHAR(4) CHARACTER SET ucs2 COLLATE ucs2_romanian_ci; @@ -50596,7 +50596,7 @@ SET NAMES utf8; CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8) ENGINE=Memory CHARACTER SET utf8; SHOW TABLE STATUS LIKE 't1'; Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment Max_index_length Temporary -t1 MEMORY # # # # # # # # # # # # utf8mb3_general_ci # # # 0 N +t1 MEMORY # # # # # # # # # # # # utf8mb3_uca1400_ai_ci # # # 0 N LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1; ALTER TABLE test.t1 CHANGE a a CHAR(4) CHARACTER SET ucs2 COLLATE ucs2_slovak_ci; @@ -53137,7 +53137,7 @@ SET NAMES utf8; CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8) ENGINE=Memory CHARACTER SET utf8; SHOW TABLE STATUS LIKE 't1'; Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment Max_index_length Temporary -t1 MEMORY # # # # # # # # # # # # utf8mb3_general_ci # # # 0 N +t1 MEMORY # # # # # # # # # # # # utf8mb3_uca1400_ai_ci # # # 0 N LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1; ALTER TABLE test.t1 CHANGE a a CHAR(4) CHARACTER SET ucs2 COLLATE ucs2_slovenian_ci; @@ -55678,7 +55678,7 @@ SET NAMES utf8; CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8) ENGINE=Memory CHARACTER SET utf8; SHOW TABLE STATUS LIKE 't1'; Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment Max_index_length Temporary -t1 MEMORY # # # # # # # # # # # # utf8mb3_general_ci # # # 0 N +t1 MEMORY # # # # # # # # # # # # utf8mb3_uca1400_ai_ci # # # 0 N LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1; ALTER TABLE test.t1 CHANGE a a CHAR(4) CHARACTER SET ucs2 COLLATE ucs2_spanish2_ci; @@ -58219,7 +58219,7 @@ SET NAMES utf8; CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8) ENGINE=Memory CHARACTER SET utf8; SHOW TABLE STATUS LIKE 't1'; Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment Max_index_length Temporary -t1 MEMORY # # # # # # # # # # # # utf8mb3_general_ci # # # 0 N +t1 MEMORY # # # # # # # # # # # # utf8mb3_uca1400_ai_ci # # # 0 N LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1; ALTER TABLE test.t1 CHANGE a a CHAR(4) CHARACTER SET ucs2 COLLATE ucs2_spanish_ci; @@ -60760,7 +60760,7 @@ SET NAMES utf8; CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8) ENGINE=Memory CHARACTER SET utf8; SHOW TABLE STATUS LIKE 't1'; Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment Max_index_length Temporary -t1 MEMORY # # # # # # # # # # # # utf8mb3_general_ci # # # 0 N +t1 MEMORY # # # # # # # # # # # # utf8mb3_uca1400_ai_ci # # # 0 N LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1; ALTER TABLE test.t1 CHANGE a a CHAR(4) CHARACTER SET ucs2 COLLATE ucs2_swedish_ci; @@ -63301,7 +63301,7 @@ SET NAMES utf8; CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8) ENGINE=Memory CHARACTER SET utf8; SHOW TABLE STATUS LIKE 't1'; Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment Max_index_length Temporary -t1 MEMORY # # # # # # # # # # # # utf8mb3_general_ci # # # 0 N +t1 MEMORY # # # # # # # # # # # # utf8mb3_uca1400_ai_ci # # # 0 N LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1; ALTER TABLE test.t1 CHANGE a a CHAR(4) CHARACTER SET ucs2 COLLATE ucs2_turkish_ci; @@ -65842,7 +65842,7 @@ SET NAMES utf8; CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8) ENGINE=Memory CHARACTER SET utf8; SHOW TABLE STATUS LIKE 't1'; Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment Max_index_length Temporary -t1 MEMORY # # # # # # # # # # # # utf8mb3_general_ci # # # 0 N +t1 MEMORY # # # # # # # # # # # # utf8mb3_uca1400_ai_ci # # # 0 N LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1; ALTER TABLE test.t1 CHANGE a a CHAR(4) CHARACTER SET ucs2 COLLATE ucs2_unicode_ci; diff --git a/mysql-test/suite/funcs_2/r/myisam_charset.result b/mysql-test/suite/funcs_2/r/myisam_charset.result index b6cbebd4ec1..512d7babe19 100644 --- a/mysql-test/suite/funcs_2/r/myisam_charset.result +++ b/mysql-test/suite/funcs_2/r/myisam_charset.result @@ -17563,7 +17563,7 @@ SET NAMES utf8; CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8) ENGINE=MyISAM CHARACTER SET utf8; SHOW TABLE STATUS LIKE 't1'; Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment Max_index_length Temporary -t1 MyISAM # # # # # # # # # # # # utf8mb3_general_ci # # # 17179868160 N +t1 MyISAM # # # # # # # # # # # # utf8mb3_uca1400_ai_ci # # # 17179868160 N LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1; ALTER TABLE test.t1 CHANGE a a CHAR(4) CHARACTER SET ucs2 COLLATE ucs2_bin; @@ -20104,7 +20104,7 @@ SET NAMES utf8; CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8) ENGINE=MyISAM CHARACTER SET utf8; SHOW TABLE STATUS LIKE 't1'; Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment Max_index_length Temporary -t1 MyISAM # # # # # # # # # # # # utf8mb3_general_ci # # # 17179868160 N +t1 MyISAM # # # # # # # # # # # # utf8mb3_uca1400_ai_ci # # # 17179868160 N LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1; ALTER TABLE test.t1 CHANGE a a CHAR(4) CHARACTER SET ucs2 COLLATE ucs2_czech_ci; @@ -22645,7 +22645,7 @@ SET NAMES utf8; CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8) ENGINE=MyISAM CHARACTER SET utf8; SHOW TABLE STATUS LIKE 't1'; Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment Max_index_length Temporary -t1 MyISAM # # # # # # # # # # # # utf8mb3_general_ci # # # 17179868160 N +t1 MyISAM # # # # # # # # # # # # utf8mb3_uca1400_ai_ci # # # 17179868160 N LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1; ALTER TABLE test.t1 CHANGE a a CHAR(4) CHARACTER SET ucs2 COLLATE ucs2_danish_ci; @@ -25186,7 +25186,7 @@ SET NAMES utf8; CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8) ENGINE=MyISAM CHARACTER SET utf8; SHOW TABLE STATUS LIKE 't1'; Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment Max_index_length Temporary -t1 MyISAM # # # # # # # # # # # # utf8mb3_general_ci # # # 17179868160 N +t1 MyISAM # # # # # # # # # # # # utf8mb3_uca1400_ai_ci # # # 17179868160 N LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1; ALTER TABLE test.t1 CHANGE a a CHAR(4) CHARACTER SET ucs2 COLLATE ucs2_estonian_ci; @@ -27727,7 +27727,7 @@ SET NAMES utf8; CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8) ENGINE=MyISAM CHARACTER SET utf8; SHOW TABLE STATUS LIKE 't1'; Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment Max_index_length Temporary -t1 MyISAM # # # # # # # # # # # # utf8mb3_general_ci # # # 17179868160 N +t1 MyISAM # # # # # # # # # # # # utf8mb3_uca1400_ai_ci # # # 17179868160 N LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1; ALTER TABLE test.t1 CHANGE a a CHAR(4) CHARACTER SET ucs2 COLLATE ucs2_general_ci; @@ -30268,7 +30268,7 @@ SET NAMES utf8; CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8) ENGINE=MyISAM CHARACTER SET utf8; SHOW TABLE STATUS LIKE 't1'; Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment Max_index_length Temporary -t1 MyISAM # # # # # # # # # # # # utf8mb3_general_ci # # # 17179868160 N +t1 MyISAM # # # # # # # # # # # # utf8mb3_uca1400_ai_ci # # # 17179868160 N LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1; ALTER TABLE test.t1 CHANGE a a CHAR(4) CHARACTER SET ucs2 COLLATE ucs2_hungarian_ci; @@ -32809,7 +32809,7 @@ SET NAMES utf8; CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8) ENGINE=MyISAM CHARACTER SET utf8; SHOW TABLE STATUS LIKE 't1'; Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment Max_index_length Temporary -t1 MyISAM # # # # # # # # # # # # utf8mb3_general_ci # # # 17179868160 N +t1 MyISAM # # # # # # # # # # # # utf8mb3_uca1400_ai_ci # # # 17179868160 N LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1; ALTER TABLE test.t1 CHANGE a a CHAR(4) CHARACTER SET ucs2 COLLATE ucs2_icelandic_ci; @@ -35350,7 +35350,7 @@ SET NAMES utf8; CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8) ENGINE=MyISAM CHARACTER SET utf8; SHOW TABLE STATUS LIKE 't1'; Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment Max_index_length Temporary -t1 MyISAM # # # # # # # # # # # # utf8mb3_general_ci # # # 17179868160 N +t1 MyISAM # # # # # # # # # # # # utf8mb3_uca1400_ai_ci # # # 17179868160 N LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1; ALTER TABLE test.t1 CHANGE a a CHAR(4) CHARACTER SET ucs2 COLLATE ucs2_latvian_ci; @@ -37891,7 +37891,7 @@ SET NAMES utf8; CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8) ENGINE=MyISAM CHARACTER SET utf8; SHOW TABLE STATUS LIKE 't1'; Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment Max_index_length Temporary -t1 MyISAM # # # # # # # # # # # # utf8mb3_general_ci # # # 17179868160 N +t1 MyISAM # # # # # # # # # # # # utf8mb3_uca1400_ai_ci # # # 17179868160 N LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1; ALTER TABLE test.t1 CHANGE a a CHAR(4) CHARACTER SET ucs2 COLLATE ucs2_lithuanian_ci; @@ -40432,7 +40432,7 @@ SET NAMES utf8; CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8) ENGINE=MyISAM CHARACTER SET utf8; SHOW TABLE STATUS LIKE 't1'; Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment Max_index_length Temporary -t1 MyISAM # # # # # # # # # # # # utf8mb3_general_ci # # # 17179868160 N +t1 MyISAM # # # # # # # # # # # # utf8mb3_uca1400_ai_ci # # # 17179868160 N LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1; ALTER TABLE test.t1 CHANGE a a CHAR(4) CHARACTER SET ucs2 COLLATE ucs2_persian_ci; @@ -42973,7 +42973,7 @@ SET NAMES utf8; CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8) ENGINE=MyISAM CHARACTER SET utf8; SHOW TABLE STATUS LIKE 't1'; Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment Max_index_length Temporary -t1 MyISAM # # # # # # # # # # # # utf8mb3_general_ci # # # 17179868160 N +t1 MyISAM # # # # # # # # # # # # utf8mb3_uca1400_ai_ci # # # 17179868160 N LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1; ALTER TABLE test.t1 CHANGE a a CHAR(4) CHARACTER SET ucs2 COLLATE ucs2_polish_ci; @@ -45514,7 +45514,7 @@ SET NAMES utf8; CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8) ENGINE=MyISAM CHARACTER SET utf8; SHOW TABLE STATUS LIKE 't1'; Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment Max_index_length Temporary -t1 MyISAM # # # # # # # # # # # # utf8mb3_general_ci # # # 17179868160 N +t1 MyISAM # # # # # # # # # # # # utf8mb3_uca1400_ai_ci # # # 17179868160 N LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1; ALTER TABLE test.t1 CHANGE a a CHAR(4) CHARACTER SET ucs2 COLLATE ucs2_roman_ci; @@ -48055,7 +48055,7 @@ SET NAMES utf8; CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8) ENGINE=MyISAM CHARACTER SET utf8; SHOW TABLE STATUS LIKE 't1'; Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment Max_index_length Temporary -t1 MyISAM # # # # # # # # # # # # utf8mb3_general_ci # # # 17179868160 N +t1 MyISAM # # # # # # # # # # # # utf8mb3_uca1400_ai_ci # # # 17179868160 N LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1; ALTER TABLE test.t1 CHANGE a a CHAR(4) CHARACTER SET ucs2 COLLATE ucs2_romanian_ci; @@ -50596,7 +50596,7 @@ SET NAMES utf8; CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8) ENGINE=MyISAM CHARACTER SET utf8; SHOW TABLE STATUS LIKE 't1'; Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment Max_index_length Temporary -t1 MyISAM # # # # # # # # # # # # utf8mb3_general_ci # # # 17179868160 N +t1 MyISAM # # # # # # # # # # # # utf8mb3_uca1400_ai_ci # # # 17179868160 N LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1; ALTER TABLE test.t1 CHANGE a a CHAR(4) CHARACTER SET ucs2 COLLATE ucs2_slovak_ci; @@ -53137,7 +53137,7 @@ SET NAMES utf8; CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8) ENGINE=MyISAM CHARACTER SET utf8; SHOW TABLE STATUS LIKE 't1'; Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment Max_index_length Temporary -t1 MyISAM # # # # # # # # # # # # utf8mb3_general_ci # # # 17179868160 N +t1 MyISAM # # # # # # # # # # # # utf8mb3_uca1400_ai_ci # # # 17179868160 N LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1; ALTER TABLE test.t1 CHANGE a a CHAR(4) CHARACTER SET ucs2 COLLATE ucs2_slovenian_ci; @@ -55678,7 +55678,7 @@ SET NAMES utf8; CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8) ENGINE=MyISAM CHARACTER SET utf8; SHOW TABLE STATUS LIKE 't1'; Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment Max_index_length Temporary -t1 MyISAM # # # # # # # # # # # # utf8mb3_general_ci # # # 17179868160 N +t1 MyISAM # # # # # # # # # # # # utf8mb3_uca1400_ai_ci # # # 17179868160 N LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1; ALTER TABLE test.t1 CHANGE a a CHAR(4) CHARACTER SET ucs2 COLLATE ucs2_spanish2_ci; @@ -58219,7 +58219,7 @@ SET NAMES utf8; CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8) ENGINE=MyISAM CHARACTER SET utf8; SHOW TABLE STATUS LIKE 't1'; Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment Max_index_length Temporary -t1 MyISAM # # # # # # # # # # # # utf8mb3_general_ci # # # 17179868160 N +t1 MyISAM # # # # # # # # # # # # utf8mb3_uca1400_ai_ci # # # 17179868160 N LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1; ALTER TABLE test.t1 CHANGE a a CHAR(4) CHARACTER SET ucs2 COLLATE ucs2_spanish_ci; @@ -60760,7 +60760,7 @@ SET NAMES utf8; CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8) ENGINE=MyISAM CHARACTER SET utf8; SHOW TABLE STATUS LIKE 't1'; Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment Max_index_length Temporary -t1 MyISAM # # # # # # # # # # # # utf8mb3_general_ci # # # 17179868160 N +t1 MyISAM # # # # # # # # # # # # utf8mb3_uca1400_ai_ci # # # 17179868160 N LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1; ALTER TABLE test.t1 CHANGE a a CHAR(4) CHARACTER SET ucs2 COLLATE ucs2_swedish_ci; @@ -63301,7 +63301,7 @@ SET NAMES utf8; CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8) ENGINE=MyISAM CHARACTER SET utf8; SHOW TABLE STATUS LIKE 't1'; Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment Max_index_length Temporary -t1 MyISAM # # # # # # # # # # # # utf8mb3_general_ci # # # 17179868160 N +t1 MyISAM # # # # # # # # # # # # utf8mb3_uca1400_ai_ci # # # 17179868160 N LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1; ALTER TABLE test.t1 CHANGE a a CHAR(4) CHARACTER SET ucs2 COLLATE ucs2_turkish_ci; @@ -65842,7 +65842,7 @@ SET NAMES utf8; CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8) ENGINE=MyISAM CHARACTER SET utf8; SHOW TABLE STATUS LIKE 't1'; Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment Max_index_length Temporary -t1 MyISAM # # # # # # # # # # # # utf8mb3_general_ci # # # 17179868160 N +t1 MyISAM # # # # # # # # # # # # utf8mb3_uca1400_ai_ci # # # 17179868160 N LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1; ALTER TABLE test.t1 CHANGE a a CHAR(4) CHARACTER SET ucs2 COLLATE ucs2_unicode_ci; diff --git a/mysql-test/suite/gcol/r/innodb_virtual_index.result b/mysql-test/suite/gcol/r/innodb_virtual_index.result index a26da4ae176..8ce81de7b5a 100644 --- a/mysql-test/suite/gcol/r/innodb_virtual_index.result +++ b/mysql-test/suite/gcol/r/innodb_virtual_index.result @@ -203,7 +203,7 @@ t1 CREATE TABLE `t1` ( `col1` int(10) DEFAULT NULL, `col2` char(21) GENERATED ALWAYS AS (`col1` * `col1`) VIRTUAL, KEY `n` (`col2`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci DROP TABLE t1; # # Bug #27968952 INNODB CRASH/CORRUPTION WITH TEXT PREFIX INDEXES diff --git a/mysql-test/suite/innodb/r/alter_varchar_change.result b/mysql-test/suite/innodb/r/alter_varchar_change.result index 8b9608b9b4f..de0bd1a1daa 100644 --- a/mysql-test/suite/innodb/r/alter_varchar_change.result +++ b/mysql-test/suite/innodb/r/alter_varchar_change.result @@ -468,7 +468,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f1` int(11) NOT NULL, - `f2` varchar(200) CHARACTER SET utf16 COLLATE utf16_general_ci DEFAULT NULL, + `f2` varchar(200) CHARACTER SET utf16 COLLATE utf16_uca1400_ai_ci DEFAULT NULL, KEY `idx` (`f2`(40)) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; diff --git a/mysql-test/suite/innodb/r/innodb-16k.result b/mysql-test/suite/innodb/r/innodb-16k.result index a7fbe8602e1..1471a0287ad 100644 --- a/mysql-test/suite/innodb/r/innodb-16k.result +++ b/mysql-test/suite/innodb/r/innodb-16k.result @@ -243,7 +243,7 @@ t1 CREATE TABLE `t1` ( `d` text NOT NULL, PRIMARY KEY (`a`,`b`(255),`c`(255)), KEY `b` (`b`(767)) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci CHECK TABLE t1; Table Op Msg_type Msg_text test.t1 check status OK diff --git a/mysql-test/suite/innodb/r/innodb-fk.result b/mysql-test/suite/innodb/r/innodb-fk.result index e06c744fedd..945484d5dc7 100644 --- a/mysql-test/suite/innodb/r/innodb-fk.result +++ b/mysql-test/suite/innodb/r/innodb-fk.result @@ -89,7 +89,7 @@ person CREATE TABLE `person` ( `Name` varchar(50) NOT NULL, PRIMARY KEY (`Id`), CONSTRAINT `fk_person_group` FOREIGN KEY (`Id`) REFERENCES `group` (`Id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci CREATE TABLE `kg_test2`.`person2` ( `Id` INT(11) NOT NULL AUTO_INCREMENT, `Name` VARCHAR(50) NOT NULL, @@ -110,7 +110,7 @@ person2 CREATE TABLE `person2` ( `Name` varchar(50) NOT NULL, PRIMARY KEY (`Id`), CONSTRAINT `fk_person_group` FOREIGN KEY (`Id`) REFERENCES `kg_test1`.`group` (`Id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci SHOW WARNINGS; Level Code Message DROP DATABASE kg_test2; @@ -136,7 +136,7 @@ Table Create Table KEY `id_depart_in` (`id_depart_in`), CONSTRAINT `#departaments_tree_ibfk_1` FOREIGN KEY (`id_depart`) REFERENCES `#departaments` (`id_depart`), CONSTRAINT `#departaments_tree_ibfk_2` FOREIGN KEY (`id_depart_in`) REFERENCES `#departaments` (`id_depart`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci DROP TABLE `#departaments_tree`; DROP TABLE `#departaments`; CREATE TABLE `boroda` ( @@ -164,7 +164,7 @@ Table Create Table KEY `b` (`b`), CONSTRAINT `#boroda_ibfk_1` FOREIGN KEY (`a`) REFERENCES `#boroda` (`id`), CONSTRAINT `#boroda_ibfk_2` FOREIGN KEY (`b`) REFERENCES `#boroda` (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci DROP TABLE `#boroda`; CREATE TABLE `boroda` ( `id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT, @@ -188,7 +188,7 @@ bor#oda CREATE TABLE `bor#oda` ( KEY `b` (`b`), CONSTRAINT `bor#oda_ibfk_1` FOREIGN KEY (`a`) REFERENCES `bor#oda` (`id`), CONSTRAINT `bor#oda_ibfk_2` FOREIGN KEY (`b`) REFERENCES `bor#oda` (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci DROP TABLE `bor#oda`; # # MDEV-21127 Assertion `(size_t)(ptr - buf) < MAX_TEXT - 4' failed in key_text::key_text diff --git a/mysql-test/suite/innodb/r/innodb-index.result b/mysql-test/suite/innodb/r/innodb-index.result index 8346b61dfed..173fbb8e17d 100644 --- a/mysql-test/suite/innodb/r/innodb-index.result +++ b/mysql-test/suite/innodb/r/innodb-index.result @@ -579,7 +579,7 @@ t1 CREATE TABLE `t1` ( `c` char(10) DEFAULT NULL, `d` varchar(20) DEFAULT NULL, PRIMARY KEY (`a`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci alter table t1 add index (b); insert into t1 values(10,10,'kkk','iii'); select * from t1; @@ -610,7 +610,7 @@ t1 CREATE TABLE `t1` ( `d` varchar(20) DEFAULT NULL, PRIMARY KEY (`a`), KEY `b` (`b`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci alter table t1 add unique index (c), add index (d); insert into t1 values(11,11,'aaa','mmm'); select * from t1; @@ -669,7 +669,7 @@ t1 CREATE TABLE `t1` ( UNIQUE KEY `c` (`c`), KEY `b` (`b`), KEY `d` (`d`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci check table t1; Table Op Msg_type Msg_text test.t1 check status OK diff --git a/mysql-test/suite/innodb/r/innodb-index_ucs2.result b/mysql-test/suite/innodb/r/innodb-index_ucs2.result index a6e38280bcb..d0dfc9d6dbe 100644 --- a/mysql-test/suite/innodb/r/innodb-index_ucs2.result +++ b/mysql-test/suite/innodb/r/innodb-index_ucs2.result @@ -19,7 +19,7 @@ t1 CREATE TABLE `t1` ( `c` char(10) DEFAULT NULL, `d` varchar(20) DEFAULT NULL, PRIMARY KEY (`a`) -) ENGINE=InnoDB DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci +) ENGINE=InnoDB DEFAULT CHARSET=ucs2 COLLATE=ucs2_uca1400_ai_ci alter table t1 add index (b); insert into t1 values(10,10,'kkk','iii'); select * from t1; @@ -50,7 +50,7 @@ t1 CREATE TABLE `t1` ( `d` varchar(20) DEFAULT NULL, PRIMARY KEY (`a`), KEY `b` (`b`) -) ENGINE=InnoDB DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci +) ENGINE=InnoDB DEFAULT CHARSET=ucs2 COLLATE=ucs2_uca1400_ai_ci alter table t1 add unique index (c), add index (d); insert into t1 values(11,11,'aaa','mmm'); select * from t1; @@ -109,7 +109,7 @@ t1 CREATE TABLE `t1` ( UNIQUE KEY `c` (`c`), KEY `b` (`b`), KEY `d` (`d`) -) ENGINE=InnoDB DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci +) ENGINE=InnoDB DEFAULT CHARSET=ucs2 COLLATE=ucs2_uca1400_ai_ci check table t1; Table Op Msg_type Msg_text test.t1 check status OK diff --git a/mysql-test/suite/innodb/r/innodb-ucs2.result b/mysql-test/suite/innodb/r/innodb-ucs2.result index b6bff7d5f42..3a0588fea89 100644 --- a/mysql-test/suite/innodb/r/innodb-ucs2.result +++ b/mysql-test/suite/innodb/r/innodb-ucs2.result @@ -1,10 +1,10 @@ drop table if exists t1, t2; create table t1 ( a int, b char(10), c char(10), filler char(10), primary key(a, b(2)), unique key (a, c(2)) -) character set utf8 engine = innodb; +) character set utf8 collate utf8_general_ci engine = innodb; create table t2 ( a int, b char(10), c char(10), filler char(10), primary key(a, b(2)), unique key (a, c(2)) -) character set ucs2 engine = innodb; +) character set ucs2 collate ucs2_general_ci engine = innodb; insert into t1 values (1,'abcdefg','abcdefg','one'); insert into t1 values (2,'ijkilmn','ijkilmn','two'); insert into t1 values (3,'qrstuvw','qrstuvw','three'); @@ -55,10 +55,10 @@ drop table t1; drop table t2; create table t1 ( a int, b varchar(10), c varchar(10), filler varchar(10), primary key(a, b(2)), unique key (a, c(2)) -) character set utf8 engine = innodb; +) character set utf8 collate utf8_general_ci engine = innodb; create table t2 ( a int, b varchar(10), c varchar(10), filler varchar(10), primary key(a, b(2)), unique key (a, c(2)) -) character set ucs2 engine = innodb; +) character set ucs2 collate ucs2_general_ci engine = innodb; insert into t1 values (1,'abcdefg','abcdefg','one'); insert into t1 values (2,'ijkilmn','ijkilmn','two'); insert into t1 values (3,'qrstuvw','qrstuvw','three'); diff --git a/mysql-test/suite/innodb/r/innodb-virtual-columns.result b/mysql-test/suite/innodb/r/innodb-virtual-columns.result index b97eaac7565..fee02122563 100644 --- a/mysql-test/suite/innodb/r/innodb-virtual-columns.result +++ b/mysql-test/suite/innodb/r/innodb-virtual-columns.result @@ -38,7 +38,7 @@ grad_degree CREATE TABLE `grad_degree` ( `deg_start_term` char(4) NOT NULL DEFAULT '' COMMENT 'Educated guess at the beginning of the data', `deg_as_of_term` char(4) NOT NULL COMMENT 'In most cases also end term', PRIMARY KEY (`student_id`,`plan`,`admit_term`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci CREATE INDEX grad_degree_wdraw_rsn_ndx ON grad_degree (wdraw_rsn); CREATE INDEX grad_degree_as_of_term_ndx ON grad_degree (deg_as_of_term); INSERT IGNORE grad_degree ( @@ -153,7 +153,7 @@ grad_degree CREATE TABLE `grad_degree` ( `deg_start_term` char(4) NOT NULL DEFAULT '' COMMENT 'Educated guess at the beginning of the data', `deg_as_of_term` char(4) NOT NULL COMMENT 'In most cases also end term', PRIMARY KEY (`student_id`,`plan`,`admit_term`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci CREATE INDEX grad_degree_wdraw_rsn_ndx ON grad_degree (wdraw_rsn); CREATE INDEX grad_degree_as_of_term_ndx ON grad_degree (deg_as_of_term); INSERT IGNORE grad_degree ( @@ -210,7 +210,7 @@ grad_degree CREATE TABLE `grad_degree` ( `deg_as_of_term` char(4) NOT NULL COMMENT 'In most cases also end term', PRIMARY KEY (`student_id`,`plan`,`admit_term`), KEY `grad_degree_as_of_term_ndx` (`deg_as_of_term`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci DROP TABLE grad_degree; CREATE TABLE IF NOT EXISTS grad_degree ( student_id int(8) UNSIGNED NOT NULL, @@ -289,7 +289,7 @@ grad_degree CREATE TABLE `grad_degree` ( `deg_start_term` char(4) NOT NULL DEFAULT '' COMMENT 'Educated guess at the beginning of the data', `deg_as_of_term` char(4) NOT NULL COMMENT 'In most cases also end term', PRIMARY KEY (`student_id`,`plan`,`admit_term`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci CREATE INDEX grad_degree_wdraw_rsn_ndx ON grad_degree (wdraw_rsn); ALTER TABLE grad_degree DROP COLUMN ofis_deg_status2, DROP COLUMN ofis_deg_status3, DROP COLUMN ofis_deg_status4, DROP COLUMN ofis_deg_status5, DROP COLUMN ofis_deg_status6, diff --git a/mysql-test/suite/innodb/r/innodb.result b/mysql-test/suite/innodb/r/innodb.result index f1cf23d6eaf..d612d2dae1b 100644 --- a/mysql-test/suite/innodb/r/innodb.result +++ b/mysql-test/suite/innodb/r/innodb.result @@ -2269,7 +2269,7 @@ create table t1 (v char(10) character set utf8); show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `v` char(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL + `v` char(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop table t1; create table t1 (v varchar(10), c char(10)) row_format=fixed; @@ -2322,7 +2322,7 @@ Note 1246 Converting column 'v' from VARCHAR to TEXT show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `v` mediumtext CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL + `v` mediumtext CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop table t1; SET sql_mode = default; diff --git a/mysql-test/suite/innodb/r/innodb_mysql.result b/mysql-test/suite/innodb/r/innodb_mysql.result index 99e42e67277..adc00145a62 100644 --- a/mysql-test/suite/innodb/r/innodb_mysql.result +++ b/mysql-test/suite/innodb/r/innodb_mysql.result @@ -1552,7 +1552,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` text DEFAULT NULL, KEY `a` (`a`(1024)) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci drop table t1; CREATE TABLE t1 ( a INT, diff --git a/mysql-test/suite/innodb/t/innodb-ucs2.test b/mysql-test/suite/innodb/t/innodb-ucs2.test index 010d27ab851..b188e6551d3 100644 --- a/mysql-test/suite/innodb/t/innodb-ucs2.test +++ b/mysql-test/suite/innodb/t/innodb-ucs2.test @@ -11,10 +11,10 @@ drop table if exists t1, t2; create table t1 ( a int, b char(10), c char(10), filler char(10), primary key(a, b(2)), unique key (a, c(2)) -) character set utf8 engine = innodb; +) character set utf8 collate utf8_general_ci engine = innodb; create table t2 ( a int, b char(10), c char(10), filler char(10), primary key(a, b(2)), unique key (a, c(2)) -) character set ucs2 engine = innodb; +) character set ucs2 collate ucs2_general_ci engine = innodb; insert into t1 values (1,'abcdefg','abcdefg','one'); insert into t1 values (2,'ijkilmn','ijkilmn','two'); insert into t1 values (3,'qrstuvw','qrstuvw','three'); @@ -44,10 +44,10 @@ drop table t2; create table t1 ( a int, b varchar(10), c varchar(10), filler varchar(10), primary key(a, b(2)), unique key (a, c(2)) -) character set utf8 engine = innodb; +) character set utf8 collate utf8_general_ci engine = innodb; create table t2 ( a int, b varchar(10), c varchar(10), filler varchar(10), primary key(a, b(2)), unique key (a, c(2)) -) character set ucs2 engine = innodb; +) character set ucs2 collate ucs2_general_ci engine = innodb; insert into t1 values (1,'abcdefg','abcdefg','one'); insert into t1 values (2,'ijkilmn','ijkilmn','two'); insert into t1 values (3,'qrstuvw','qrstuvw','three'); diff --git a/mysql-test/suite/innodb/t/instant_alter_extend.combinations b/mysql-test/suite/innodb/t/instant_alter_extend.combinations index 1465bf59ad7..8d0b5bf6dca 100644 --- a/mysql-test/suite/innodb/t/instant_alter_extend.combinations +++ b/mysql-test/suite/innodb/t/instant_alter_extend.combinations @@ -3,3 +3,4 @@ character-set-server=latin1 [utf8] character-set-server=utf8 +collation-server=utf8_general_ci diff --git a/mysql-test/suite/innodb_fts/r/fulltext.result b/mysql-test/suite/innodb_fts/r/fulltext.result index 2a6fb81f4bb..5e16602985f 100644 --- a/mysql-test/suite/innodb_fts/r/fulltext.result +++ b/mysql-test/suite/innodb_fts/r/fulltext.result @@ -349,7 +349,7 @@ INSERT t1 VALUES (" (" , !"),(" !"); SELECT t, collation(t) FROM t1 WHERE MATCH t AGAINST (''); t collation(t) - - utf8mb3_general_ci + - utf8mb3_uca1400_ai_ci DROP TABLE t1; CREATE TABLE t1 (s varchar(255), FULLTEXT (s)) ENGINE = InnoDB DEFAULT CHARSET=utf8; insert into t1 (s) values ('pra para para'),('para para para'); diff --git a/mysql-test/suite/innodb_fts/r/innodb_fts_misc_1.result b/mysql-test/suite/innodb_fts/r/innodb_fts_misc_1.result index 6d7a5647a63..2a34b7e6a2b 100644 --- a/mysql-test/suite/innodb_fts/r/innodb_fts_misc_1.result +++ b/mysql-test/suite/innodb_fts/r/innodb_fts_misc_1.result @@ -486,7 +486,7 @@ t1 CREATE TABLE `t1` ( `b` text DEFAULT NULL, PRIMARY KEY (`id`), FULLTEXT KEY `idx` (`a`,`b`) -) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci ROW_FORMAT=COMPRESSED +) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci ROW_FORMAT=COMPRESSED SELECT count(*) FROM information_schema.innodb_sys_tables WHERE name LIKE "%FTS_%" AND space !=0; count(*) 11 diff --git a/mysql-test/suite/innodb_fts/r/misc_1.result b/mysql-test/suite/innodb_fts/r/misc_1.result index 1087f25b2cd..29c8dd07884 100644 --- a/mysql-test/suite/innodb_fts/r/misc_1.result +++ b/mysql-test/suite/innodb_fts/r/misc_1.result @@ -484,7 +484,7 @@ t1 CREATE TABLE `t1` ( `b` text DEFAULT NULL, PRIMARY KEY (`id`), FULLTEXT KEY `idx` (`a`,`b`) -) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci ROW_FORMAT=COMPRESSED +) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci ROW_FORMAT=COMPRESSED SELECT count(*) FROM information_schema.innodb_sys_tables WHERE name LIKE "%FTS_%" AND space !=0; count(*) 11 diff --git a/mysql-test/suite/innodb_zip/r/page_size,4k.rdiff b/mysql-test/suite/innodb_zip/r/page_size,4k.rdiff index c901bf6dbe0..249ea14a8b9 100644 --- a/mysql-test/suite/innodb_zip/r/page_size,4k.rdiff +++ b/mysql-test/suite/innodb_zip/r/page_size,4k.rdiff @@ -341,7 +341,7 @@ - `d` text NOT NULL, - PRIMARY KEY (`a`,`b`(255),`c`(255)), - KEY `b` (`b`(767)) --) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci STATS_PERSISTENT=0 +-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci STATS_PERSISTENT=0 -CHECK TABLE t1; -Table Op Msg_type Msg_text -test.t1 check status OK diff --git a/mysql-test/suite/innodb_zip/r/page_size,8k.rdiff b/mysql-test/suite/innodb_zip/r/page_size,8k.rdiff index 90b2a1f7c48..9bcda057311 100644 --- a/mysql-test/suite/innodb_zip/r/page_size,8k.rdiff +++ b/mysql-test/suite/innodb_zip/r/page_size,8k.rdiff @@ -311,7 +311,7 @@ - `d` text NOT NULL, - PRIMARY KEY (`a`,`b`(255),`c`(255)), - KEY `b` (`b`(767)) --) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci STATS_PERSISTENT=0 +-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci STATS_PERSISTENT=0 -CHECK TABLE t1; -Table Op Msg_type Msg_text -test.t1 check status OK diff --git a/mysql-test/suite/innodb_zip/r/page_size.result b/mysql-test/suite/innodb_zip/r/page_size.result index 93d5559f5ee..3f47a349148 100644 --- a/mysql-test/suite/innodb_zip/r/page_size.result +++ b/mysql-test/suite/innodb_zip/r/page_size.result @@ -375,7 +375,7 @@ t1 CREATE TABLE `t1` ( `d` text NOT NULL, PRIMARY KEY (`a`,`b`(255),`c`(255)), KEY `b` (`b`(767)) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci STATS_PERSISTENT=0 +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci STATS_PERSISTENT=0 CHECK TABLE t1; Table Op Msg_type Msg_text test.t1 check status OK diff --git a/mysql-test/suite/innodb_zip/r/prefix_index_liftedlimit.result b/mysql-test/suite/innodb_zip/r/prefix_index_liftedlimit.result index d29082ad9d4..9d71f203a4c 100644 --- a/mysql-test/suite/innodb_zip/r/prefix_index_liftedlimit.result +++ b/mysql-test/suite/innodb_zip/r/prefix_index_liftedlimit.result @@ -762,10 +762,10 @@ WHERE col_1_text = REPEAT("c", 4000) AND col_2_text = REPEAT("o", 4000); col_1_text = REPEAT("क", 4000) INSERT INTO worklog5743 VALUES(REPEAT("a", 4000),REPEAT("o", 4000)); DELETE FROM worklog5743 WHERE col_1_text = REPEAT("b", 4000); -SELECT col_1_text = REPEAT("क", 4000) FROM worklog5743; +SELECT col_1_text = REPEAT("क", 4000) FROM worklog5743 ORDER BY col_1_text; col_1_text = REPEAT("क", 4000) -0 1 +0 DROP TABLE worklog5743; CREATE TABLE worklog5743 ( col_1_text TEXT(4000) , col_2_text TEXT(4000) , diff --git a/mysql-test/suite/innodb_zip/t/prefix_index_liftedlimit.test b/mysql-test/suite/innodb_zip/t/prefix_index_liftedlimit.test index de27ddce658..2f9037d6560 100644 --- a/mysql-test/suite/innodb_zip/t/prefix_index_liftedlimit.test +++ b/mysql-test/suite/innodb_zip/t/prefix_index_liftedlimit.test @@ -690,7 +690,7 @@ SELECT col_1_text = REPEAT("क", 4000) FROM worklog5743 WHERE col_1_text = REPEAT("c", 4000) AND col_2_text = REPEAT("o", 4000); INSERT INTO worklog5743 VALUES(REPEAT("a", 4000),REPEAT("o", 4000)); DELETE FROM worklog5743 WHERE col_1_text = REPEAT("b", 4000); -SELECT col_1_text = REPEAT("क", 4000) FROM worklog5743; +SELECT col_1_text = REPEAT("क", 4000) FROM worklog5743 ORDER BY col_1_text; DROP TABLE worklog5743; diff --git a/mysql-test/suite/jp/r/jp_alter_ucs2.result b/mysql-test/suite/jp/r/jp_alter_ucs2.result index 336bd6fec94..feec36b1a1f 100644 --- a/mysql-test/suite/jp/r/jp_alter_ucs2.result +++ b/mysql-test/suite/jp/r/jp_alter_ucs2.result @@ -45,7 +45,7 @@ Table Create Table PRIMARY KEY (``), UNIQUE KEY `` (``), KEY `` (``) -) ENGINE=InnoDB DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci +) ENGINE=InnoDB DEFAULT CHARSET=ucs2 COLLATE=ucs2_uca1400_ai_ci ALTER TABLE `` DROP INDEX ``; ALTER TABLE `` DROP PRIMARY KEY; ALTER TABLE `` DROP INDEX ``; @@ -64,7 +64,7 @@ SHOW CREATE TABLE ` Table Create Table CREATE TABLE `` ( `` char(6) NOT NULL -) ENGINE=InnoDB DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci +) ENGINE=InnoDB DEFAULT CHARSET=ucs2 COLLATE=ucs2_uca1400_ai_ci ALTER TABLE `` ADD `` char(1) FIRST; ALTER TABLE `` ADD `` char(1) AFTER ``; ALTER TABLE `` ADD `` char(1); @@ -94,7 +94,7 @@ Table Create Table PRIMARY KEY (``), UNIQUE KEY `` (``), KEY `` (``) -) ENGINE=InnoDB DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci +) ENGINE=InnoDB DEFAULT CHARSET=ucs2 COLLATE=ucs2_uca1400_ai_ci ALTER TABLE `` DROP INDEX ``; ALTER TABLE `` DROP PRIMARY KEY; ALTER TABLE `` DROP INDEX ``; @@ -113,7 +113,7 @@ SHOW CREATE TABLE ` Table Create Table CREATE TABLE `` ( `` char(6) NOT NULL -) ENGINE=InnoDB DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci +) ENGINE=InnoDB DEFAULT CHARSET=ucs2 COLLATE=ucs2_uca1400_ai_ci ALTER TABLE `ݏݏ` ADD `` char(1) FIRST; ALTER TABLE `ݏݏ` ADD `` char(1) AFTER ``; ALTER TABLE `ݏݏ` ADD `` char(1); @@ -143,7 +143,7 @@ Table Create Table PRIMARY KEY (``), UNIQUE KEY `` (``), KEY `` (``) -) ENGINE=InnoDB DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci +) ENGINE=InnoDB DEFAULT CHARSET=ucs2 COLLATE=ucs2_uca1400_ai_ci ALTER TABLE `ݏݏ` DROP INDEX ``; ALTER TABLE `ݏݏ` DROP PRIMARY KEY; ALTER TABLE `ݏݏ` DROP INDEX ``; @@ -162,7 +162,7 @@ SHOW CREATE TABLE ` Table Create Table ݏݏ CREATE TABLE `ݏݏ` ( `` char(6) NOT NULL -) ENGINE=InnoDB DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci +) ENGINE=InnoDB DEFAULT CHARSET=ucs2 COLLATE=ucs2_uca1400_ai_ci DROP TABLE ``; DROP TABLE ``; DROP TABLE ``; @@ -207,7 +207,7 @@ Table Create Table PRIMARY KEY (``), UNIQUE KEY `` (``), KEY `` (``) -) ENGINE=MyISAM DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci +) ENGINE=MyISAM DEFAULT CHARSET=ucs2 COLLATE=ucs2_uca1400_ai_ci ALTER TABLE `` DROP INDEX ``; ALTER TABLE `` DROP PRIMARY KEY; ALTER TABLE `` DROP INDEX ``; @@ -226,7 +226,7 @@ SHOW CREATE TABLE ` Table Create Table CREATE TABLE `` ( `` char(6) NOT NULL -) ENGINE=MyISAM DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci +) ENGINE=MyISAM DEFAULT CHARSET=ucs2 COLLATE=ucs2_uca1400_ai_ci ALTER TABLE `` ADD `` char(1) FIRST; ALTER TABLE `` ADD `` char(1) AFTER ``; ALTER TABLE `` ADD `` char(1); @@ -256,7 +256,7 @@ Table Create Table PRIMARY KEY (``), UNIQUE KEY `` (``), KEY `` (``) -) ENGINE=MyISAM DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci +) ENGINE=MyISAM DEFAULT CHARSET=ucs2 COLLATE=ucs2_uca1400_ai_ci ALTER TABLE `` DROP INDEX ``; ALTER TABLE `` DROP PRIMARY KEY; ALTER TABLE `` DROP INDEX ``; @@ -275,7 +275,7 @@ SHOW CREATE TABLE ` Table Create Table CREATE TABLE `` ( `` char(6) NOT NULL -) ENGINE=MyISAM DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci +) ENGINE=MyISAM DEFAULT CHARSET=ucs2 COLLATE=ucs2_uca1400_ai_ci ALTER TABLE `ݏݏ` ADD `` char(1) FIRST; ALTER TABLE `ݏݏ` ADD `` char(1) AFTER ``; ALTER TABLE `ݏݏ` ADD `` char(1); @@ -305,7 +305,7 @@ Table Create Table PRIMARY KEY (``), UNIQUE KEY `` (``), KEY `` (``) -) ENGINE=MyISAM DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci +) ENGINE=MyISAM DEFAULT CHARSET=ucs2 COLLATE=ucs2_uca1400_ai_ci ALTER TABLE `ݏݏ` DROP INDEX ``; ALTER TABLE `ݏݏ` DROP PRIMARY KEY; ALTER TABLE `ݏݏ` DROP INDEX ``; @@ -324,7 +324,7 @@ SHOW CREATE TABLE ` Table Create Table ݏݏ CREATE TABLE `ݏݏ` ( `` char(6) NOT NULL -) ENGINE=MyISAM DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci +) ENGINE=MyISAM DEFAULT CHARSET=ucs2 COLLATE=ucs2_uca1400_ai_ci DROP TABLE ``; DROP TABLE ``; DROP TABLE ``; @@ -369,7 +369,7 @@ Table Create Table PRIMARY KEY (``), UNIQUE KEY `` (``), KEY `` (``) -) ENGINE=MEMORY DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci +) ENGINE=MEMORY DEFAULT CHARSET=ucs2 COLLATE=ucs2_uca1400_ai_ci ALTER TABLE `` DROP INDEX ``; ALTER TABLE `` DROP PRIMARY KEY; ALTER TABLE `` DROP INDEX ``; @@ -388,7 +388,7 @@ SHOW CREATE TABLE ` Table Create Table CREATE TABLE `` ( `` char(6) NOT NULL -) ENGINE=MEMORY DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci +) ENGINE=MEMORY DEFAULT CHARSET=ucs2 COLLATE=ucs2_uca1400_ai_ci ALTER TABLE `` ADD `` char(1) FIRST; ALTER TABLE `` ADD `` char(1) AFTER ``; ALTER TABLE `` ADD `` char(1); @@ -418,7 +418,7 @@ Table Create Table PRIMARY KEY (``), UNIQUE KEY `` (``), KEY `` (``) -) ENGINE=MEMORY DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci +) ENGINE=MEMORY DEFAULT CHARSET=ucs2 COLLATE=ucs2_uca1400_ai_ci ALTER TABLE `` DROP INDEX ``; ALTER TABLE `` DROP PRIMARY KEY; ALTER TABLE `` DROP INDEX ``; @@ -437,7 +437,7 @@ SHOW CREATE TABLE ` Table Create Table CREATE TABLE `` ( `` char(6) NOT NULL -) ENGINE=MEMORY DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci +) ENGINE=MEMORY DEFAULT CHARSET=ucs2 COLLATE=ucs2_uca1400_ai_ci ALTER TABLE `ݏݏ` ADD `` char(1) FIRST; ALTER TABLE `ݏݏ` ADD `` char(1) AFTER ``; ALTER TABLE `ݏݏ` ADD `` char(1); @@ -467,7 +467,7 @@ Table Create Table PRIMARY KEY (``), UNIQUE KEY `` (``), KEY `` (``) -) ENGINE=MEMORY DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci +) ENGINE=MEMORY DEFAULT CHARSET=ucs2 COLLATE=ucs2_uca1400_ai_ci ALTER TABLE `ݏݏ` DROP INDEX ``; ALTER TABLE `ݏݏ` DROP PRIMARY KEY; ALTER TABLE `ݏݏ` DROP INDEX ``; @@ -486,7 +486,7 @@ SHOW CREATE TABLE ` Table Create Table ݏݏ CREATE TABLE `ݏݏ` ( `` char(6) NOT NULL -) ENGINE=MEMORY DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci +) ENGINE=MEMORY DEFAULT CHARSET=ucs2 COLLATE=ucs2_uca1400_ai_ci DROP TABLE ``; DROP TABLE ``; DROP TABLE ``; diff --git a/mysql-test/suite/jp/r/jp_alter_utf8.result b/mysql-test/suite/jp/r/jp_alter_utf8.result index 545b127415c..3330df5e099 100644 --- a/mysql-test/suite/jp/r/jp_alter_utf8.result +++ b/mysql-test/suite/jp/r/jp_alter_utf8.result @@ -44,7 +44,7 @@ Table Create Table PRIMARY KEY (`ｷｷｷ`), UNIQUE KEY `ｸｸｸ` (`ｸｸｸ`), KEY `ｶｶｶ` (`ｶｶ`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci ALTER TABLE `ｱｱｱ` DROP INDEX `ｶｶｶ`; ALTER TABLE `ｱｱｱ` DROP PRIMARY KEY; ALTER TABLE `ｱｱｱ` DROP INDEX `ｸｸｸ`; @@ -63,7 +63,7 @@ SHOW CREATE TABLE `ｱｱｱ`; Table Create Table ｱｱｱ CREATE TABLE `ｱｱｱ` ( `ｷｷｷ` char(6) NOT NULL -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci ALTER TABLE `あああ` ADD `かかか` char(1) FIRST; ALTER TABLE `あああ` ADD `くくく` char(1) AFTER `ききき`; ALTER TABLE `あああ` ADD `けけけ` char(1); @@ -93,7 +93,7 @@ Table Create Table PRIMARY KEY (`ききき`), UNIQUE KEY `くくく` (`くくく`), KEY `かかか` (`かか`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci ALTER TABLE `あああ` DROP INDEX `かかか`; ALTER TABLE `あああ` DROP PRIMARY KEY; ALTER TABLE `あああ` DROP INDEX `くくく`; @@ -112,7 +112,7 @@ SHOW CREATE TABLE `あああ`; Table Create Table あああ CREATE TABLE `あああ` ( `ききき` char(6) NOT NULL -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci ALTER TABLE `龖龖龖` ADD `丄丄丄` char(1) FIRST; ALTER TABLE `龖龖龖` ADD `丅丅丅` char(1) AFTER `丂丂丂`; ALTER TABLE `龖龖龖` ADD `乚乚乚` char(1); @@ -142,7 +142,7 @@ Table Create Table PRIMARY KEY (`丂丂丂`), UNIQUE KEY `丅丅丅` (`丅丅丅`), KEY `丄丄丄` (`丄丄`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci ALTER TABLE `龖龖龖` DROP INDEX `丄丄丄`; ALTER TABLE `龖龖龖` DROP PRIMARY KEY; ALTER TABLE `龖龖龖` DROP INDEX `丅丅丅`; @@ -161,7 +161,7 @@ SHOW CREATE TABLE `龖龖龖`; Table Create Table 龖龖龖 CREATE TABLE `龖龖龖` ( `丂丂丂` char(6) NOT NULL -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci DROP TABLE `ｱｱｱ`; DROP TABLE `ｲｲｲ`; DROP TABLE `あああ`; @@ -206,7 +206,7 @@ Table Create Table PRIMARY KEY (`ｷｷｷ`), UNIQUE KEY `ｸｸｸ` (`ｸｸｸ`), KEY `ｶｶｶ` (`ｶｶ`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci ALTER TABLE `ｱｱｱ` DROP INDEX `ｶｶｶ`; ALTER TABLE `ｱｱｱ` DROP PRIMARY KEY; ALTER TABLE `ｱｱｱ` DROP INDEX `ｸｸｸ`; @@ -225,7 +225,7 @@ SHOW CREATE TABLE `ｱｱｱ`; Table Create Table ｱｱｱ CREATE TABLE `ｱｱｱ` ( `ｷｷｷ` char(6) NOT NULL -) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci ALTER TABLE `あああ` ADD `かかか` char(1) FIRST; ALTER TABLE `あああ` ADD `くくく` char(1) AFTER `ききき`; ALTER TABLE `あああ` ADD `けけけ` char(1); @@ -255,7 +255,7 @@ Table Create Table PRIMARY KEY (`ききき`), UNIQUE KEY `くくく` (`くくく`), KEY `かかか` (`かか`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci ALTER TABLE `あああ` DROP INDEX `かかか`; ALTER TABLE `あああ` DROP PRIMARY KEY; ALTER TABLE `あああ` DROP INDEX `くくく`; @@ -274,7 +274,7 @@ SHOW CREATE TABLE `あああ`; Table Create Table あああ CREATE TABLE `あああ` ( `ききき` char(6) NOT NULL -) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci ALTER TABLE `龖龖龖` ADD `丄丄丄` char(1) FIRST; ALTER TABLE `龖龖龖` ADD `丅丅丅` char(1) AFTER `丂丂丂`; ALTER TABLE `龖龖龖` ADD `乚乚乚` char(1); @@ -304,7 +304,7 @@ Table Create Table PRIMARY KEY (`丂丂丂`), UNIQUE KEY `丅丅丅` (`丅丅丅`), KEY `丄丄丄` (`丄丄`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci ALTER TABLE `龖龖龖` DROP INDEX `丄丄丄`; ALTER TABLE `龖龖龖` DROP PRIMARY KEY; ALTER TABLE `龖龖龖` DROP INDEX `丅丅丅`; @@ -323,7 +323,7 @@ SHOW CREATE TABLE `龖龖龖`; Table Create Table 龖龖龖 CREATE TABLE `龖龖龖` ( `丂丂丂` char(6) NOT NULL -) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci DROP TABLE `ｱｱｱ`; DROP TABLE `ｲｲｲ`; DROP TABLE `あああ`; @@ -368,7 +368,7 @@ Table Create Table PRIMARY KEY (`ｷｷｷ`), UNIQUE KEY `ｸｸｸ` (`ｸｸｸ`), KEY `ｶｶｶ` (`ｶｶ`) -) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci ALTER TABLE `ｱｱｱ` DROP INDEX `ｶｶｶ`; ALTER TABLE `ｱｱｱ` DROP PRIMARY KEY; ALTER TABLE `ｱｱｱ` DROP INDEX `ｸｸｸ`; @@ -387,7 +387,7 @@ SHOW CREATE TABLE `ｱｱｱ`; Table Create Table ｱｱｱ CREATE TABLE `ｱｱｱ` ( `ｷｷｷ` char(6) NOT NULL -) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci ALTER TABLE `あああ` ADD `かかか` char(1) FIRST; ALTER TABLE `あああ` ADD `くくく` char(1) AFTER `ききき`; ALTER TABLE `あああ` ADD `けけけ` char(1); @@ -417,7 +417,7 @@ Table Create Table PRIMARY KEY (`ききき`), UNIQUE KEY `くくく` (`くくく`), KEY `かかか` (`かか`) -) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci ALTER TABLE `あああ` DROP INDEX `かかか`; ALTER TABLE `あああ` DROP PRIMARY KEY; ALTER TABLE `あああ` DROP INDEX `くくく`; @@ -436,7 +436,7 @@ SHOW CREATE TABLE `あああ`; Table Create Table あああ CREATE TABLE `あああ` ( `ききき` char(6) NOT NULL -) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci ALTER TABLE `龖龖龖` ADD `丄丄丄` char(1) FIRST; ALTER TABLE `龖龖龖` ADD `丅丅丅` char(1) AFTER `丂丂丂`; ALTER TABLE `龖龖龖` ADD `乚乚乚` char(1); @@ -466,7 +466,7 @@ Table Create Table PRIMARY KEY (`丂丂丂`), UNIQUE KEY `丅丅丅` (`丅丅丅`), KEY `丄丄丄` (`丄丄`) -) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci ALTER TABLE `龖龖龖` DROP INDEX `丄丄丄`; ALTER TABLE `龖龖龖` DROP PRIMARY KEY; ALTER TABLE `龖龖龖` DROP INDEX `丅丅丅`; @@ -485,7 +485,7 @@ SHOW CREATE TABLE `龖龖龖`; Table Create Table 龖龖龖 CREATE TABLE `龖龖龖` ( `丂丂丂` char(6) NOT NULL -) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci DROP TABLE `ｱｱｱ`; DROP TABLE `ｲｲｲ`; DROP TABLE `あああ`; diff --git a/mysql-test/suite/jp/r/jp_create_tbl_ucs2.result b/mysql-test/suite/jp/r/jp_create_tbl_ucs2.result index d9dca059550..7fd13fbd9b8 100644 --- a/mysql-test/suite/jp/r/jp_create_tbl_ucs2.result +++ b/mysql-test/suite/jp/r/jp_create_tbl_ucs2.result @@ -97,77 +97,77 @@ SHOW CREATE TABLE ` Table Create Table CREATE TABLE `` ( `` char(1) DEFAULT NULL -) ENGINE=InnoDB DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci +) ENGINE=InnoDB DEFAULT CHARSET=ucs2 COLLATE=ucs2_uca1400_ai_ci SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( `` char(1) DEFAULT NULL -) ENGINE=InnoDB DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci +) ENGINE=InnoDB DEFAULT CHARSET=ucs2 COLLATE=ucs2_uca1400_ai_ci SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( `` char(1) DEFAULT NULL -) ENGINE=InnoDB DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci +) ENGINE=InnoDB DEFAULT CHARSET=ucs2 COLLATE=ucs2_uca1400_ai_ci SHOW CREATE TABLE ``; Table Create Table CREATE TEMPORARY TABLE `` ( `` char(1) DEFAULT NULL -) ENGINE=InnoDB DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci +) ENGINE=InnoDB DEFAULT CHARSET=ucs2 COLLATE=ucs2_uca1400_ai_ci SHOW CREATE TABLE ``; Table Create Table CREATE TEMPORARY TABLE `` ( `` char(1) DEFAULT NULL -) ENGINE=InnoDB DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci +) ENGINE=InnoDB DEFAULT CHARSET=ucs2 COLLATE=ucs2_uca1400_ai_ci SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( `` char(1) DEFAULT NULL -) ENGINE=InnoDB DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci +) ENGINE=InnoDB DEFAULT CHARSET=ucs2 COLLATE=ucs2_uca1400_ai_ci SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( `` char(1) DEFAULT NULL -) ENGINE=InnoDB DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci +) ENGINE=InnoDB DEFAULT CHARSET=ucs2 COLLATE=ucs2_uca1400_ai_ci SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( `` char(1) DEFAULT NULL -) ENGINE=InnoDB DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci +) ENGINE=InnoDB DEFAULT CHARSET=ucs2 COLLATE=ucs2_uca1400_ai_ci SHOW CREATE TABLE ``; Table Create Table CREATE TEMPORARY TABLE `` ( `` char(1) DEFAULT NULL -) ENGINE=InnoDB DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci +) ENGINE=InnoDB DEFAULT CHARSET=ucs2 COLLATE=ucs2_uca1400_ai_ci SHOW CREATE TABLE ``; Table Create Table CREATE TEMPORARY TABLE `` ( `` char(1) DEFAULT NULL -) ENGINE=InnoDB DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci +) ENGINE=InnoDB DEFAULT CHARSET=ucs2 COLLATE=ucs2_uca1400_ai_ci SHOW CREATE TABLE `ݏݏ`; Table Create Table ݏݏ CREATE TABLE `ݏݏ` ( `` char(1) DEFAULT NULL -) ENGINE=InnoDB DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci +) ENGINE=InnoDB DEFAULT CHARSET=ucs2 COLLATE=ucs2_uca1400_ai_ci SHOW CREATE TABLE `ޏޏ`; Table Create Table ޏޏ CREATE TABLE `ޏޏ` ( `` char(1) DEFAULT NULL -) ENGINE=InnoDB DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci +) ENGINE=InnoDB DEFAULT CHARSET=ucs2 COLLATE=ucs2_uca1400_ai_ci SHOW CREATE TABLE `ߏߏ`; Table Create Table ߏߏ CREATE TABLE `ߏߏ` ( `` char(1) DEFAULT NULL -) ENGINE=InnoDB DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci +) ENGINE=InnoDB DEFAULT CHARSET=ucs2 COLLATE=ucs2_uca1400_ai_ci SHOW CREATE TABLE ``; Table Create Table CREATE TEMPORARY TABLE `` ( `` char(1) DEFAULT NULL -) ENGINE=InnoDB DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci +) ENGINE=InnoDB DEFAULT CHARSET=ucs2 COLLATE=ucs2_uca1400_ai_ci SHOW CREATE TABLE ``; Table Create Table CREATE TEMPORARY TABLE `` ( `` char(1) DEFAULT NULL -) ENGINE=InnoDB DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci +) ENGINE=InnoDB DEFAULT CHARSET=ucs2 COLLATE=ucs2_uca1400_ai_ci DROP TABLE ``; DROP TABLE ``; DROP TABLE ``; @@ -265,77 +265,77 @@ SHOW CREATE TABLE ` Table Create Table CREATE TABLE `` ( `` char(1) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci +) ENGINE=MyISAM DEFAULT CHARSET=ucs2 COLLATE=ucs2_uca1400_ai_ci SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( `` char(1) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci +) ENGINE=MyISAM DEFAULT CHARSET=ucs2 COLLATE=ucs2_uca1400_ai_ci SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( `` char(1) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci +) ENGINE=MyISAM DEFAULT CHARSET=ucs2 COLLATE=ucs2_uca1400_ai_ci SHOW CREATE TABLE ``; Table Create Table CREATE TEMPORARY TABLE `` ( `` char(1) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci +) ENGINE=MyISAM DEFAULT CHARSET=ucs2 COLLATE=ucs2_uca1400_ai_ci SHOW CREATE TABLE ``; Table Create Table CREATE TEMPORARY TABLE `` ( `` char(1) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci +) ENGINE=MyISAM DEFAULT CHARSET=ucs2 COLLATE=ucs2_uca1400_ai_ci SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( `` char(1) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci +) ENGINE=MyISAM DEFAULT CHARSET=ucs2 COLLATE=ucs2_uca1400_ai_ci SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( `` char(1) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci +) ENGINE=MyISAM DEFAULT CHARSET=ucs2 COLLATE=ucs2_uca1400_ai_ci SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( `` char(1) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci +) ENGINE=MyISAM DEFAULT CHARSET=ucs2 COLLATE=ucs2_uca1400_ai_ci SHOW CREATE TABLE ``; Table Create Table CREATE TEMPORARY TABLE `` ( `` char(1) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci +) ENGINE=MyISAM DEFAULT CHARSET=ucs2 COLLATE=ucs2_uca1400_ai_ci SHOW CREATE TABLE ``; Table Create Table CREATE TEMPORARY TABLE `` ( `` char(1) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci +) ENGINE=MyISAM DEFAULT CHARSET=ucs2 COLLATE=ucs2_uca1400_ai_ci SHOW CREATE TABLE `ݏݏ`; Table Create Table ݏݏ CREATE TABLE `ݏݏ` ( `` char(1) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci +) ENGINE=MyISAM DEFAULT CHARSET=ucs2 COLLATE=ucs2_uca1400_ai_ci SHOW CREATE TABLE `ޏޏ`; Table Create Table ޏޏ CREATE TABLE `ޏޏ` ( `` char(1) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci +) ENGINE=MyISAM DEFAULT CHARSET=ucs2 COLLATE=ucs2_uca1400_ai_ci SHOW CREATE TABLE `ߏߏ`; Table Create Table ߏߏ CREATE TABLE `ߏߏ` ( `` char(1) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci +) ENGINE=MyISAM DEFAULT CHARSET=ucs2 COLLATE=ucs2_uca1400_ai_ci SHOW CREATE TABLE ``; Table Create Table CREATE TEMPORARY TABLE `` ( `` char(1) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci +) ENGINE=MyISAM DEFAULT CHARSET=ucs2 COLLATE=ucs2_uca1400_ai_ci SHOW CREATE TABLE ``; Table Create Table CREATE TEMPORARY TABLE `` ( `` char(1) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci +) ENGINE=MyISAM DEFAULT CHARSET=ucs2 COLLATE=ucs2_uca1400_ai_ci DROP TABLE ``; DROP TABLE ``; DROP TABLE ``; @@ -433,77 +433,77 @@ SHOW CREATE TABLE ` Table Create Table CREATE TABLE `` ( `` char(1) DEFAULT NULL -) ENGINE=MEMORY DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci +) ENGINE=MEMORY DEFAULT CHARSET=ucs2 COLLATE=ucs2_uca1400_ai_ci SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( `` char(1) DEFAULT NULL -) ENGINE=MEMORY DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci +) ENGINE=MEMORY DEFAULT CHARSET=ucs2 COLLATE=ucs2_uca1400_ai_ci SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( `` char(1) DEFAULT NULL -) ENGINE=MEMORY DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci +) ENGINE=MEMORY DEFAULT CHARSET=ucs2 COLLATE=ucs2_uca1400_ai_ci SHOW CREATE TABLE ``; Table Create Table CREATE TEMPORARY TABLE `` ( `` char(1) DEFAULT NULL -) ENGINE=MEMORY DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci +) ENGINE=MEMORY DEFAULT CHARSET=ucs2 COLLATE=ucs2_uca1400_ai_ci SHOW CREATE TABLE ``; Table Create Table CREATE TEMPORARY TABLE `` ( `` char(1) DEFAULT NULL -) ENGINE=MEMORY DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci +) ENGINE=MEMORY DEFAULT CHARSET=ucs2 COLLATE=ucs2_uca1400_ai_ci SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( `` char(1) DEFAULT NULL -) ENGINE=MEMORY DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci +) ENGINE=MEMORY DEFAULT CHARSET=ucs2 COLLATE=ucs2_uca1400_ai_ci SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( `` char(1) DEFAULT NULL -) ENGINE=MEMORY DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci +) ENGINE=MEMORY DEFAULT CHARSET=ucs2 COLLATE=ucs2_uca1400_ai_ci SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( `` char(1) DEFAULT NULL -) ENGINE=MEMORY DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci +) ENGINE=MEMORY DEFAULT CHARSET=ucs2 COLLATE=ucs2_uca1400_ai_ci SHOW CREATE TABLE ``; Table Create Table CREATE TEMPORARY TABLE `` ( `` char(1) DEFAULT NULL -) ENGINE=MEMORY DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci +) ENGINE=MEMORY DEFAULT CHARSET=ucs2 COLLATE=ucs2_uca1400_ai_ci SHOW CREATE TABLE ``; Table Create Table CREATE TEMPORARY TABLE `` ( `` char(1) DEFAULT NULL -) ENGINE=MEMORY DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci +) ENGINE=MEMORY DEFAULT CHARSET=ucs2 COLLATE=ucs2_uca1400_ai_ci SHOW CREATE TABLE `ݏݏ`; Table Create Table ݏݏ CREATE TABLE `ݏݏ` ( `` char(1) DEFAULT NULL -) ENGINE=MEMORY DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci +) ENGINE=MEMORY DEFAULT CHARSET=ucs2 COLLATE=ucs2_uca1400_ai_ci SHOW CREATE TABLE `ޏޏ`; Table Create Table ޏޏ CREATE TABLE `ޏޏ` ( `` char(1) DEFAULT NULL -) ENGINE=MEMORY DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci +) ENGINE=MEMORY DEFAULT CHARSET=ucs2 COLLATE=ucs2_uca1400_ai_ci SHOW CREATE TABLE `ߏߏ`; Table Create Table ߏߏ CREATE TABLE `ߏߏ` ( `` char(1) DEFAULT NULL -) ENGINE=MEMORY DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci +) ENGINE=MEMORY DEFAULT CHARSET=ucs2 COLLATE=ucs2_uca1400_ai_ci SHOW CREATE TABLE ``; Table Create Table CREATE TEMPORARY TABLE `` ( `` char(1) DEFAULT NULL -) ENGINE=MEMORY DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci +) ENGINE=MEMORY DEFAULT CHARSET=ucs2 COLLATE=ucs2_uca1400_ai_ci SHOW CREATE TABLE ``; Table Create Table CREATE TEMPORARY TABLE `` ( `` char(1) DEFAULT NULL -) ENGINE=MEMORY DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci +) ENGINE=MEMORY DEFAULT CHARSET=ucs2 COLLATE=ucs2_uca1400_ai_ci DROP TABLE ``; DROP TABLE ``; DROP TABLE ``; diff --git a/mysql-test/suite/jp/r/jp_create_tbl_utf8.result b/mysql-test/suite/jp/r/jp_create_tbl_utf8.result index 13958490aa7..18892f64a10 100644 --- a/mysql-test/suite/jp/r/jp_create_tbl_utf8.result +++ b/mysql-test/suite/jp/r/jp_create_tbl_utf8.result @@ -97,77 +97,77 @@ SHOW CREATE TABLE `ｱｱｱ`; Table Create Table ｱｱｱ CREATE TABLE `ｱｱｱ` ( `ｶｶｶ` char(1) DEFAULT NULL -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci SHOW CREATE TABLE `ｲｲｲ`; Table Create Table ｲｲｲ CREATE TABLE `ｲｲｲ` ( `ｷｷｷ` char(1) DEFAULT NULL -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci SHOW CREATE TABLE `ｳｳｳ`; Table Create Table ｳｳｳ CREATE TABLE `ｳｳｳ` ( `ｸｸｸ` char(1) DEFAULT NULL -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci SHOW CREATE TABLE `ｴｴｴ`; Table Create Table ｴｴｴ CREATE TEMPORARY TABLE `ｴｴｴ` ( `ｹｹｹ` char(1) DEFAULT NULL -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci SHOW CREATE TABLE `ｵｵｵ`; Table Create Table ｵｵｵ CREATE TEMPORARY TABLE `ｵｵｵ` ( `ｺｺｺ` char(1) DEFAULT NULL -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci SHOW CREATE TABLE `あああ`; Table Create Table あああ CREATE TABLE `あああ` ( `かかか` char(1) DEFAULT NULL -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci SHOW CREATE TABLE `いいい`; Table Create Table いいい CREATE TABLE `いいい` ( `ききき` char(1) DEFAULT NULL -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci SHOW CREATE TABLE `ううう`; Table Create Table ううう CREATE TABLE `ううう` ( `くくく` char(1) DEFAULT NULL -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci SHOW CREATE TABLE `えええ`; Table Create Table えええ CREATE TEMPORARY TABLE `えええ` ( `けけけ` char(1) DEFAULT NULL -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci SHOW CREATE TABLE `おおお`; Table Create Table おおお CREATE TEMPORARY TABLE `おおお` ( `こここ` char(1) DEFAULT NULL -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci SHOW CREATE TABLE `龖龖龖`; Table Create Table 龖龖龖 CREATE TABLE `龖龖龖` ( `丂丂丂` char(1) DEFAULT NULL -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci SHOW CREATE TABLE `龗龗龗`; Table Create Table 龗龗龗 CREATE TABLE `龗龗龗` ( `丄丄丄` char(1) DEFAULT NULL -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci SHOW CREATE TABLE `龞龞龞`; Table Create Table 龞龞龞 CREATE TABLE `龞龞龞` ( `丅丅丅` char(1) DEFAULT NULL -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci SHOW CREATE TABLE `龡龡龡`; Table Create Table 龡龡龡 CREATE TEMPORARY TABLE `龡龡龡` ( `丌丌丌` char(1) DEFAULT NULL -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci SHOW CREATE TABLE `龢龢龢`; Table Create Table 龢龢龢 CREATE TEMPORARY TABLE `龢龢龢` ( `丒丒丒` char(1) DEFAULT NULL -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci DROP TABLE `ｱｱｱ`; DROP TABLE `ｲｲｲ`; DROP TABLE `ｳｳｳ`; @@ -265,77 +265,77 @@ SHOW CREATE TABLE `ｱｱｱ`; Table Create Table ｱｱｱ CREATE TABLE `ｱｱｱ` ( `ｶｶｶ` char(1) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci SHOW CREATE TABLE `ｲｲｲ`; Table Create Table ｲｲｲ CREATE TABLE `ｲｲｲ` ( `ｷｷｷ` char(1) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci SHOW CREATE TABLE `ｳｳｳ`; Table Create Table ｳｳｳ CREATE TABLE `ｳｳｳ` ( `ｸｸｸ` char(1) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci SHOW CREATE TABLE `ｴｴｴ`; Table Create Table ｴｴｴ CREATE TEMPORARY TABLE `ｴｴｴ` ( `ｹｹｹ` char(1) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci SHOW CREATE TABLE `ｵｵｵ`; Table Create Table ｵｵｵ CREATE TEMPORARY TABLE `ｵｵｵ` ( `ｺｺｺ` char(1) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci SHOW CREATE TABLE `あああ`; Table Create Table あああ CREATE TABLE `あああ` ( `かかか` char(1) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci SHOW CREATE TABLE `いいい`; Table Create Table いいい CREATE TABLE `いいい` ( `ききき` char(1) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci SHOW CREATE TABLE `ううう`; Table Create Table ううう CREATE TABLE `ううう` ( `くくく` char(1) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci SHOW CREATE TABLE `えええ`; Table Create Table えええ CREATE TEMPORARY TABLE `えええ` ( `けけけ` char(1) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci SHOW CREATE TABLE `おおお`; Table Create Table おおお CREATE TEMPORARY TABLE `おおお` ( `こここ` char(1) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci SHOW CREATE TABLE `龖龖龖`; Table Create Table 龖龖龖 CREATE TABLE `龖龖龖` ( `丂丂丂` char(1) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci SHOW CREATE TABLE `龗龗龗`; Table Create Table 龗龗龗 CREATE TABLE `龗龗龗` ( `丄丄丄` char(1) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci SHOW CREATE TABLE `龞龞龞`; Table Create Table 龞龞龞 CREATE TABLE `龞龞龞` ( `丅丅丅` char(1) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci SHOW CREATE TABLE `龡龡龡`; Table Create Table 龡龡龡 CREATE TEMPORARY TABLE `龡龡龡` ( `丌丌丌` char(1) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci SHOW CREATE TABLE `龢龢龢`; Table Create Table 龢龢龢 CREATE TEMPORARY TABLE `龢龢龢` ( `丒丒丒` char(1) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci DROP TABLE `ｱｱｱ`; DROP TABLE `ｲｲｲ`; DROP TABLE `ｳｳｳ`; @@ -433,77 +433,77 @@ SHOW CREATE TABLE `ｱｱｱ`; Table Create Table ｱｱｱ CREATE TABLE `ｱｱｱ` ( `ｶｶｶ` char(1) DEFAULT NULL -) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci SHOW CREATE TABLE `ｲｲｲ`; Table Create Table ｲｲｲ CREATE TABLE `ｲｲｲ` ( `ｷｷｷ` char(1) DEFAULT NULL -) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci SHOW CREATE TABLE `ｳｳｳ`; Table Create Table ｳｳｳ CREATE TABLE `ｳｳｳ` ( `ｸｸｸ` char(1) DEFAULT NULL -) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci SHOW CREATE TABLE `ｴｴｴ`; Table Create Table ｴｴｴ CREATE TEMPORARY TABLE `ｴｴｴ` ( `ｹｹｹ` char(1) DEFAULT NULL -) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci SHOW CREATE TABLE `ｵｵｵ`; Table Create Table ｵｵｵ CREATE TEMPORARY TABLE `ｵｵｵ` ( `ｺｺｺ` char(1) DEFAULT NULL -) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci SHOW CREATE TABLE `あああ`; Table Create Table あああ CREATE TABLE `あああ` ( `かかか` char(1) DEFAULT NULL -) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci SHOW CREATE TABLE `いいい`; Table Create Table いいい CREATE TABLE `いいい` ( `ききき` char(1) DEFAULT NULL -) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci SHOW CREATE TABLE `ううう`; Table Create Table ううう CREATE TABLE `ううう` ( `くくく` char(1) DEFAULT NULL -) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci SHOW CREATE TABLE `えええ`; Table Create Table えええ CREATE TEMPORARY TABLE `えええ` ( `けけけ` char(1) DEFAULT NULL -) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci SHOW CREATE TABLE `おおお`; Table Create Table おおお CREATE TEMPORARY TABLE `おおお` ( `こここ` char(1) DEFAULT NULL -) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci SHOW CREATE TABLE `龖龖龖`; Table Create Table 龖龖龖 CREATE TABLE `龖龖龖` ( `丂丂丂` char(1) DEFAULT NULL -) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci SHOW CREATE TABLE `龗龗龗`; Table Create Table 龗龗龗 CREATE TABLE `龗龗龗` ( `丄丄丄` char(1) DEFAULT NULL -) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci SHOW CREATE TABLE `龞龞龞`; Table Create Table 龞龞龞 CREATE TABLE `龞龞龞` ( `丅丅丅` char(1) DEFAULT NULL -) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci SHOW CREATE TABLE `龡龡龡`; Table Create Table 龡龡龡 CREATE TEMPORARY TABLE `龡龡龡` ( `丌丌丌` char(1) DEFAULT NULL -) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci SHOW CREATE TABLE `龢龢龢`; Table Create Table 龢龢龢 CREATE TEMPORARY TABLE `龢龢龢` ( `丒丒丒` char(1) DEFAULT NULL -) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci DROP TABLE `ｱｱｱ`; DROP TABLE `ｲｲｲ`; DROP TABLE `ｳｳｳ`; diff --git a/mysql-test/suite/jp/r/jp_enum_ucs2.result b/mysql-test/suite/jp/r/jp_enum_ucs2.result index 683c0458dd8..486cfde80e8 100644 --- a/mysql-test/suite/jp/r/jp_enum_ucs2.result +++ b/mysql-test/suite/jp/r/jp_enum_ucs2.result @@ -78,55 +78,55 @@ Table Create Table ԣ CREATE TABLE `ԣ` ( `ã` enum('','','') DEFAULT NULL, KEY `ã` (`ã`) -) ENGINE=InnoDB DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci +) ENGINE=InnoDB DEFAULT CHARSET=ucs2 COLLATE=ucs2_uca1400_ai_ci SHOW CREATE TABLE `ԣ`; Table Create Table ԣ CREATE TABLE `ԣ` ( `ã` enum('','','') DEFAULT NULL, KEY `ã` (`ã`) -) ENGINE=InnoDB DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci +) ENGINE=InnoDB DEFAULT CHARSET=ucs2 COLLATE=ucs2_uca1400_ai_ci SHOW CREATE TABLE `ԣ`; Table Create Table ԣ CREATE TABLE `ԣ` ( `ã` enum('','','') DEFAULT NULL, KEY `ã` (`ã`) -) ENGINE=InnoDB DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci +) ENGINE=InnoDB DEFAULT CHARSET=ucs2 COLLATE=ucs2_uca1400_ai_ci SHOW CREATE TABLE `ԣ`; Table Create Table ԣ CREATE TABLE `ԣ` ( `ã` enum('','','') DEFAULT NULL, KEY `ã` (`ã`) -) ENGINE=MyISAM DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci +) ENGINE=MyISAM DEFAULT CHARSET=ucs2 COLLATE=ucs2_uca1400_ai_ci SHOW CREATE TABLE `ԣ`; Table Create Table ԣ CREATE TABLE `ԣ` ( `ã` enum('','','') DEFAULT NULL, KEY `ã` (`ã`) -) ENGINE=MyISAM DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci +) ENGINE=MyISAM DEFAULT CHARSET=ucs2 COLLATE=ucs2_uca1400_ai_ci SHOW CREATE TABLE `ԣ`; Table Create Table ԣ CREATE TABLE `ԣ` ( `ã` enum('','','') DEFAULT NULL, KEY `ã` (`ã`) -) ENGINE=MyISAM DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci +) ENGINE=MyISAM DEFAULT CHARSET=ucs2 COLLATE=ucs2_uca1400_ai_ci SHOW CREATE TABLE `ԣ`; Table Create Table ԣ CREATE TABLE `ԣ` ( `ã` enum('','','') DEFAULT NULL, KEY `ã` (`ã`) -) ENGINE=MEMORY DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci +) ENGINE=MEMORY DEFAULT CHARSET=ucs2 COLLATE=ucs2_uca1400_ai_ci SHOW CREATE TABLE `ԣ`; Table Create Table ԣ CREATE TABLE `ԣ` ( `ã` enum('','','') DEFAULT NULL, KEY `ã` (`ã`) -) ENGINE=MEMORY DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci +) ENGINE=MEMORY DEFAULT CHARSET=ucs2 COLLATE=ucs2_uca1400_ai_ci SHOW CREATE TABLE `ԣ`; Table Create Table ԣ CREATE TABLE `ԣ` ( `ã` enum('','','') DEFAULT NULL, KEY `ã` (`ã`) -) ENGINE=MEMORY DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci +) ENGINE=MEMORY DEFAULT CHARSET=ucs2 COLLATE=ucs2_uca1400_ai_ci DESC `ԣ`; Field Type Null Key Default Extra ã enum('','','') YES MUL NULL @@ -169,63 +169,63 @@ Table Create Table `ã` char(1) NOT NULL, `ã` enum('','','') DEFAULT NULL, KEY `ã` (`ã`) -) ENGINE=InnoDB DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci +) ENGINE=InnoDB DEFAULT CHARSET=ucs2 COLLATE=ucs2_uca1400_ai_ci SHOW CREATE TABLE `ԣ`; Table Create Table ԣ CREATE TABLE `ԣ` ( `ã` char(1) NOT NULL, `ã` enum('','','') DEFAULT NULL, KEY `ã` (`ã`) -) ENGINE=InnoDB DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci +) ENGINE=InnoDB DEFAULT CHARSET=ucs2 COLLATE=ucs2_uca1400_ai_ci SHOW CREATE TABLE `ԣ`; Table Create Table ԣ CREATE TABLE `ԣ` ( `ã` char(1) NOT NULL, `ã` enum('','','') DEFAULT NULL, KEY `ã` (`ã`) -) ENGINE=InnoDB DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci +) ENGINE=InnoDB DEFAULT CHARSET=ucs2 COLLATE=ucs2_uca1400_ai_ci SHOW CREATE TABLE `ԣ`; Table Create Table ԣ CREATE TABLE `ԣ` ( `ã` char(1) NOT NULL, `ã` enum('','','') DEFAULT NULL, KEY `ã` (`ã`) -) ENGINE=MyISAM DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci +) ENGINE=MyISAM DEFAULT CHARSET=ucs2 COLLATE=ucs2_uca1400_ai_ci SHOW CREATE TABLE `ԣ`; Table Create Table ԣ CREATE TABLE `ԣ` ( `ã` char(1) NOT NULL, `ã` enum('','','') DEFAULT NULL, KEY `ã` (`ã`) -) ENGINE=MyISAM DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci +) ENGINE=MyISAM DEFAULT CHARSET=ucs2 COLLATE=ucs2_uca1400_ai_ci SHOW CREATE TABLE `ԣ`; Table Create Table ԣ CREATE TABLE `ԣ` ( `ã` char(1) NOT NULL, `ã` enum('','','') DEFAULT NULL, KEY `ã` (`ã`) -) ENGINE=MyISAM DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci +) ENGINE=MyISAM DEFAULT CHARSET=ucs2 COLLATE=ucs2_uca1400_ai_ci SHOW CREATE TABLE `ԣ`; Table Create Table ԣ CREATE TABLE `ԣ` ( `ã` char(1) NOT NULL, `ã` enum('','','') DEFAULT NULL, KEY `ã` (`ã`) -) ENGINE=MEMORY DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci +) ENGINE=MEMORY DEFAULT CHARSET=ucs2 COLLATE=ucs2_uca1400_ai_ci SHOW CREATE TABLE `ԣ`; Table Create Table ԣ CREATE TABLE `ԣ` ( `ã` char(1) NOT NULL, `ã` enum('','','') DEFAULT NULL, KEY `ã` (`ã`) -) ENGINE=MEMORY DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci +) ENGINE=MEMORY DEFAULT CHARSET=ucs2 COLLATE=ucs2_uca1400_ai_ci SHOW CREATE TABLE `ԣ`; Table Create Table ԣ CREATE TABLE `ԣ` ( `ã` char(1) NOT NULL, `ã` enum('','','') DEFAULT NULL, KEY `ã` (`ã`) -) ENGINE=MEMORY DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci +) ENGINE=MEMORY DEFAULT CHARSET=ucs2 COLLATE=ucs2_uca1400_ai_ci DESC `ԣ`; Field Type Null Key Default Extra ã char(1) NO NULL diff --git a/mysql-test/suite/jp/r/jp_enum_utf8.result b/mysql-test/suite/jp/r/jp_enum_utf8.result index c6e3567e114..5445f62e1e3 100644 --- a/mysql-test/suite/jp/r/jp_enum_utf8.result +++ b/mysql-test/suite/jp/r/jp_enum_utf8.result @@ -77,55 +77,55 @@ Table Create Table Ｔ１ CREATE TABLE `Ｔ１` ( `Ｃ１` enum('ｱ','ｲ','ｳ') DEFAULT NULL, KEY `Ｃ１` (`Ｃ１`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci SHOW CREATE TABLE `Ｔ２`; Table Create Table Ｔ２ CREATE TABLE `Ｔ２` ( `Ｃ１` enum('あ','い','う') DEFAULT NULL, KEY `Ｃ１` (`Ｃ１`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci SHOW CREATE TABLE `Ｔ３`; Table Create Table Ｔ３ CREATE TABLE `Ｔ３` ( `Ｃ１` enum('龔','龖','龗') DEFAULT NULL, KEY `Ｃ１` (`Ｃ１`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci SHOW CREATE TABLE `Ｔ４`; Table Create Table Ｔ４ CREATE TABLE `Ｔ４` ( `Ｃ１` enum('ｱ','ｲ','ｳ') DEFAULT NULL, KEY `Ｃ１` (`Ｃ１`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci SHOW CREATE TABLE `Ｔ５`; Table Create Table Ｔ５ CREATE TABLE `Ｔ５` ( `Ｃ１` enum('あ','い','う') DEFAULT NULL, KEY `Ｃ１` (`Ｃ１`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci SHOW CREATE TABLE `Ｔ６`; Table Create Table Ｔ６ CREATE TABLE `Ｔ６` ( `Ｃ１` enum('龔','龖','龗') DEFAULT NULL, KEY `Ｃ１` (`Ｃ１`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci SHOW CREATE TABLE `Ｔ７`; Table Create Table Ｔ７ CREATE TABLE `Ｔ７` ( `Ｃ１` enum('ｱ','ｲ','ｳ') DEFAULT NULL, KEY `Ｃ１` (`Ｃ１`) -) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci SHOW CREATE TABLE `Ｔ８`; Table Create Table Ｔ８ CREATE TABLE `Ｔ８` ( `Ｃ１` enum('あ','い','う') DEFAULT NULL, KEY `Ｃ１` (`Ｃ１`) -) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci SHOW CREATE TABLE `Ｔ９`; Table Create Table Ｔ９ CREATE TABLE `Ｔ９` ( `Ｃ１` enum('龔','龖','龗') DEFAULT NULL, KEY `Ｃ１` (`Ｃ１`) -) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci DESC `Ｔ１`; Field Type Null Key Default Extra Ｃ１ enum('ｱ','ｲ','ｳ') YES MUL NULL @@ -168,63 +168,63 @@ Table Create Table `Ｃ２` char(1) NOT NULL, `Ｃ１` enum('ｱ','ｲ','ｳ') DEFAULT NULL, KEY `Ｃ１` (`Ｃ１`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci SHOW CREATE TABLE `Ｔ２`; Table Create Table Ｔ２ CREATE TABLE `Ｔ２` ( `Ｃ２` char(1) NOT NULL, `Ｃ１` enum('あ','い','う') DEFAULT NULL, KEY `Ｃ１` (`Ｃ１`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci SHOW CREATE TABLE `Ｔ３`; Table Create Table Ｔ３ CREATE TABLE `Ｔ３` ( `Ｃ２` char(1) NOT NULL, `Ｃ１` enum('龔','龖','龗') DEFAULT NULL, KEY `Ｃ１` (`Ｃ１`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci SHOW CREATE TABLE `Ｔ４`; Table Create Table Ｔ４ CREATE TABLE `Ｔ４` ( `Ｃ２` char(1) NOT NULL, `Ｃ１` enum('ｱ','ｲ','ｳ') DEFAULT NULL, KEY `Ｃ１` (`Ｃ１`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci SHOW CREATE TABLE `Ｔ５`; Table Create Table Ｔ５ CREATE TABLE `Ｔ５` ( `Ｃ２` char(1) NOT NULL, `Ｃ１` enum('あ','い','う') DEFAULT NULL, KEY `Ｃ１` (`Ｃ１`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci SHOW CREATE TABLE `Ｔ６`; Table Create Table Ｔ６ CREATE TABLE `Ｔ６` ( `Ｃ２` char(1) NOT NULL, `Ｃ１` enum('龔','龖','龗') DEFAULT NULL, KEY `Ｃ１` (`Ｃ１`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci SHOW CREATE TABLE `Ｔ７`; Table Create Table Ｔ７ CREATE TABLE `Ｔ７` ( `Ｃ２` char(1) NOT NULL, `Ｃ１` enum('ｱ','ｲ','ｳ') DEFAULT NULL, KEY `Ｃ１` (`Ｃ１`) -) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci SHOW CREATE TABLE `Ｔ８`; Table Create Table Ｔ８ CREATE TABLE `Ｔ８` ( `Ｃ２` char(1) NOT NULL, `Ｃ１` enum('あ','い','う') DEFAULT NULL, KEY `Ｃ１` (`Ｃ１`) -) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci SHOW CREATE TABLE `Ｔ９`; Table Create Table Ｔ９ CREATE TABLE `Ｔ９` ( `Ｃ２` char(1) NOT NULL, `Ｃ１` enum('龔','龖','龗') DEFAULT NULL, KEY `Ｃ１` (`Ｃ１`) -) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci DESC `Ｔ１`; Field Type Null Key Default Extra Ｃ２ char(1) NO NULL diff --git a/mysql-test/suite/json/r/json_no_table.result b/mysql-test/suite/json/r/json_no_table.result index df8ce6f6c5e..76a8920f2c6 100644 --- a/mysql-test/suite/json/r/json_no_table.result +++ b/mysql-test/suite/json/r/json_no_table.result @@ -3622,3 +3622,18 @@ GREATEST(NULL, j2), LEAST(j1, j2), GREATEST(j1, j2)) AS j FROM (SELECT json_compact('1') AS j1, json_compact('2') AS j2) t; j [null, null, null, null, "1", "2"] +# +# Start of 11.4 tests +# +# +# MDEV-25829 Change default collation to utf8mb4_1400_ai_ci +# +SELECT +JSON_UNQUOTE("String"), +COERCIBILITY(JSON_UNQUOTE("String")), +COLLATION(JSON_UNQUOTE("String")); +JSON_UNQUOTE("String") COERCIBILITY(JSON_UNQUOTE("String")) COLLATION(JSON_UNQUOTE("String")) +String 4 utf8mb3_general_ci +# +# End of 11.4 tests +# diff --git a/mysql-test/suite/json/r/json_table.result b/mysql-test/suite/json/r/json_table.result index ed385f86a31..b9f78de1d1e 100644 --- a/mysql-test/suite/json/r/json_table.result +++ b/mysql-test/suite/json/r/json_table.result @@ -1041,7 +1041,7 @@ name VARCHAR(10) COLLATE DEFAULT PATH '$.name' ) ) AS jt; collation(name) -utf8mb4_general_ci +utf8mb4_uca1400_ai_ci SELECT collation(name) FROM json_table('[{"name":"Jeans"}]', '$[*]' COLUMNS( @@ -1121,7 +1121,7 @@ name VARCHAR(10) CHARACTER SET utf8mb3 PATH '$.name') ) AS jt; SHOW CREATE VIEW v1; View Create View character_set_client collation_connection -v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `jt`.`name` AS `name` from JSON_TABLE('[{"name":"Laptop"}]', '$[*]' COLUMNS (`name` varchar(10) CHARSET utf8mb3 COLLATE utf8mb3_general_ci PATH '$.name')) `jt` latin1 latin1_swedish_ci +v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `jt`.`name` AS `name` from JSON_TABLE('[{"name":"Laptop"}]', '$[*]' COLUMNS (`name` varchar(10) CHARSET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci PATH '$.name')) `jt` latin1 latin1_swedish_ci DROP VIEW v1; CREATE VIEW v1 AS SELECT * FROM diff --git a/mysql-test/suite/json/r/json_table_mysql.result b/mysql-test/suite/json/r/json_table_mysql.result index 0be40a8a5c8..a99327e6d5d 100644 --- a/mysql-test/suite/json/r/json_table_mysql.result +++ b/mysql-test/suite/json/r/json_table_mysql.result @@ -1452,7 +1452,7 @@ PATH '$')) AS jt1; SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `x` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL + `x` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_uca1400_ai_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; # diff --git a/mysql-test/suite/json/t/json_no_table.test b/mysql-test/suite/json/t/json_no_table.test index d7b302c98a6..1c071c7e6c2 100644 --- a/mysql-test/suite/json/t/json_no_table.test +++ b/mysql-test/suite/json/t/json_no_table.test @@ -2286,3 +2286,19 @@ SELECT JSON_ARRAY(LEAST(NULL, NULL), GREATEST(NULL, NULL), LEAST(j1, NULL), GREATEST(NULL, j2), LEAST(j1, j2), GREATEST(j1, j2)) AS j FROM (SELECT json_compact('1') AS j1, json_compact('2') AS j2) t; +--echo # +--echo # Start of 11.4 tests +--echo # + +--echo # +--echo # MDEV-25829 Change default collation to utf8mb4_1400_ai_ci +--echo # + +SELECT + JSON_UNQUOTE("String"), + COERCIBILITY(JSON_UNQUOTE("String")), + COLLATION(JSON_UNQUOTE("String")); + +--echo # +--echo # End of 11.4 tests +--echo # diff --git a/mysql-test/suite/maria/maria-ucs2.result b/mysql-test/suite/maria/maria-ucs2.result index 869930f5f0c..cf6fc8a1566 100644 --- a/mysql-test/suite/maria/maria-ucs2.result +++ b/mysql-test/suite/maria/maria-ucs2.result @@ -22,7 +22,7 @@ test.t1 check status OK SHOW CREATE table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` varchar(800) CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL, + `a` varchar(800) CHARACTER SET ucs2 COLLATE ucs2_uca1400_ai_ci DEFAULT NULL, KEY `a` (`a`) ) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 DROP TABLE t1; diff --git a/mysql-test/suite/maria/maria.result b/mysql-test/suite/maria/maria.result index ab1065f0f05..aea90c055b1 100644 --- a/mysql-test/suite/maria/maria.result +++ b/mysql-test/suite/maria/maria.result @@ -1561,7 +1561,7 @@ create table t1 (v char(10) character set utf8); show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `v` char(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL + `v` char(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL ) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=0 drop table t1; create table t1 (v varchar(10), c char(10)) row_format=fixed; @@ -1613,7 +1613,7 @@ Note 1246 Converting column 'v' from VARCHAR to TEXT show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `v` mediumtext CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL + `v` mediumtext CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL ) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=0 drop table t1; set statement sql_mode='' for @@ -2232,7 +2232,7 @@ KEY (c2) Aria file: MYSQLD_DATADIR/test/t1 Record format: Block Crashsafe: yes -Character set: utf8mb3_general_ci (33) +Character set: utf8mb3_uca1400_ai_ci (2048) Data records: 0 Deleted blocks: 0 Block_size: 8192 Recordlength: 99 diff --git a/mysql-test/suite/mariabackup/xb_history.result b/mysql-test/suite/mariabackup/xb_history.result index 9feb5f41bd2..3750c47c2b1 100644 --- a/mysql-test/suite/mariabackup/xb_history.result +++ b/mysql-test/suite/mariabackup/xb_history.result @@ -20,7 +20,7 @@ mariadb_backup_history CREATE TABLE `mariadb_backup_history` ( `format` enum('file','tar','xbstream') DEFAULT NULL, `compressed` enum('Y','N') DEFAULT NULL, PRIMARY KEY (`uuid`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci SELECT COUNT(*) FROM mysql.mariadb_backup_history; COUNT(*) 1 diff --git a/mysql-test/suite/perfschema/t/socket_summary_by_instance_func.test b/mysql-test/suite/perfschema/t/socket_summary_by_instance_func.test index fc848922667..88971be1b61 100644 --- a/mysql-test/suite/perfschema/t/socket_summary_by_instance_func.test +++ b/mysql-test/suite/perfschema/t/socket_summary_by_instance_func.test @@ -260,7 +260,7 @@ CREATE TABLE mysqltest.my_socket_summary_by_instance ( MAX_TIMER_MISC DECIMAL(60,0) NOT NULL, pk VARCHAR(20), PRIMARY KEY(pk, EVENT_NAME, OBJECT_INSTANCE_BEGIN) -) DEFAULT CHARSET=utf8; +) DEFAULT CHARSET=utf8 COLLATE utf8_general_ci; # The CAST(... AS DECIMAL(60,0)) prevents errors which might show up in case diff --git a/mysql-test/suite/plugins/r/feedback_plugin_load.result b/mysql-test/suite/plugins/r/feedback_plugin_load.result index 23376c684dd..0f5f56c6f47 100644 --- a/mysql-test/suite/plugins/r/feedback_plugin_load.result +++ b/mysql-test/suite/plugins/r/feedback_plugin_load.result @@ -21,22 +21,49 @@ ORDER BY VARIABLE_NAME; VARIABLE_VALUE>0 VARIABLE_NAME 1 Collation used binary 1 Collation used latin1_swedish_ci +1 Collation used ucs2_general_ci +1 Collation used ucs2_uca1400_ai_ci +1 Collation used utf16_general_ci +1 Collation used utf16_uca1400_ai_ci +1 Collation used utf32_general_ci +1 Collation used utf32_uca1400_ai_ci 1 Collation used utf8mb3_bin 1 Collation used utf8mb3_general_ci +1 Collation used utf8mb3_uca1400_ai_ci 1 Collation used utf8mb4_bin +1 Collation used utf8mb4_general_ci +1 Collation used utf8mb4_uca1400_ai_ci prepare stmt from "SELECT VARIABLE_VALUE>0, VARIABLE_NAME FROM INFORMATION_SCHEMA.FEEDBACK WHERE VARIABLE_NAME LIKE 'Collation used %' ORDER BY VARIABLE_NAME"; execute stmt; VARIABLE_VALUE>0 VARIABLE_NAME 1 Collation used binary 1 Collation used latin1_swedish_ci +1 Collation used ucs2_general_ci +1 Collation used ucs2_uca1400_ai_ci +1 Collation used utf16_general_ci +1 Collation used utf16_uca1400_ai_ci +1 Collation used utf32_general_ci +1 Collation used utf32_uca1400_ai_ci 1 Collation used utf8mb3_bin 1 Collation used utf8mb3_general_ci +1 Collation used utf8mb3_uca1400_ai_ci 1 Collation used utf8mb4_bin +1 Collation used utf8mb4_general_ci +1 Collation used utf8mb4_uca1400_ai_ci execute stmt; VARIABLE_VALUE>0 VARIABLE_NAME 1 Collation used binary 1 Collation used latin1_swedish_ci +1 Collation used ucs2_general_ci +1 Collation used ucs2_uca1400_ai_ci +1 Collation used utf16_general_ci +1 Collation used utf16_uca1400_ai_ci +1 Collation used utf32_general_ci +1 Collation used utf32_uca1400_ai_ci 1 Collation used utf8mb3_bin 1 Collation used utf8mb3_general_ci +1 Collation used utf8mb3_uca1400_ai_ci 1 Collation used utf8mb4_bin +1 Collation used utf8mb4_general_ci +1 Collation used utf8mb4_uca1400_ai_ci deallocate prepare stmt; diff --git a/mysql-test/suite/rpl/r/rpl_parallel_charset.result b/mysql-test/suite/rpl/r/rpl_parallel_charset.result index 12d03bdc7fe..d593b0f6588 100644 --- a/mysql-test/suite/rpl/r/rpl_parallel_charset.result +++ b/mysql-test/suite/rpl/r/rpl_parallel_charset.result @@ -11,7 +11,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) NOT NULL, - `b` varchar(100) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL, + `b` varchar(100) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL, PRIMARY KEY (`a`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SET character_set_client=latin1; diff --git a/mysql-test/suite/rpl/r/rpl_row_create_table.result b/mysql-test/suite/rpl/r/rpl_row_create_table.result index 197b4be2c9f..2b6d49710ed 100644 --- a/mysql-test/suite/rpl/r/rpl_row_create_table.result +++ b/mysql-test/suite/rpl/r/rpl_row_create_table.result @@ -41,7 +41,7 @@ Table t3 Create Table CREATE TABLE `t3` ( `a` int(11) DEFAULT NULL, `b` int(11) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci connection slave; SHOW CREATE TABLE t1; Table t1 @@ -60,7 +60,7 @@ Table t3 Create Table CREATE TABLE `t3` ( `a` int(11) DEFAULT NULL, `b` int(11) DEFAULT NULL -) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci connection master; CREATE TABLE t5 (b INT, c INT) SELECT * FROM t3; CREATE TEMPORARY TABLE tt3 (a INT, b INT); @@ -188,7 +188,7 @@ Table t8 Create Table CREATE TABLE `t8` ( `a` int(11) DEFAULT NULL, `b` int(11) DEFAULT NULL -) ENGINE=MRG_MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=MRG_MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci SHOW CREATE TABLE t9; Table t9 Create Table CREATE TABLE `t9` ( @@ -210,7 +210,7 @@ Table t8 Create Table CREATE TABLE `t8` ( `a` int(11) DEFAULT NULL, `b` int(11) DEFAULT NULL -) ENGINE=MRG_MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=MRG_MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci SHOW CREATE TABLE t9; Table t9 Create Table CREATE TABLE `t9` ( diff --git a/mysql-test/suite/rpl/r/rpl_row_utf32.result b/mysql-test/suite/rpl/r/rpl_row_utf32.result index d167b0c747f..a72fda9f263 100644 --- a/mysql-test/suite/rpl/r/rpl_row_utf32.result +++ b/mysql-test/suite/rpl/r/rpl_row_utf32.result @@ -40,7 +40,7 @@ include/wait_for_slave_sql_error.inc [errno=1677] SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` varchar(1) CHARACTER SET utf32 COLLATE utf32_general_ci DEFAULT NULL + `a` varchar(1) CHARACTER SET utf32 COLLATE utf32_uca1400_ai_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SELECT * FROM t1 ORDER BY a; a @@ -67,7 +67,7 @@ include/wait_for_slave_sql_error.inc [errno=1677] SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` char(1) CHARACTER SET utf32 COLLATE utf32_general_ci DEFAULT NULL + `a` char(1) CHARACTER SET utf32 COLLATE utf32_uca1400_ai_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SELECT * FROM t1 ORDER BY a; a diff --git a/mysql-test/suite/vcol/r/vcol_misc.result b/mysql-test/suite/vcol/r/vcol_misc.result index 710bd105473..9f505508d4b 100644 --- a/mysql-test/suite/vcol/r/vcol_misc.result +++ b/mysql-test/suite/vcol/r/vcol_misc.result @@ -129,7 +129,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `a` char(32) DEFAULT NULL, - `v` char(32) CHARACTER SET ucs2 COLLATE ucs2_general_ci GENERATED ALWAYS AS (`a`) VIRTUAL + `v` char(32) CHARACTER SET ucs2 COLLATE ucs2_uca1400_ai_ci GENERATED ALWAYS AS (`a`) VIRTUAL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a int, b int); diff --git a/mysql-test/suite/versioning/r/partition,heap.rdiff b/mysql-test/suite/versioning/r/partition,heap.rdiff index d6c8363fc70..5dd2487238b 100644 --- a/mysql-test/suite/versioning/r/partition,heap.rdiff +++ b/mysql-test/suite/versioning/r/partition,heap.rdiff @@ -33,7 +33,7 @@ - `x` int(11) NOT NULL AUTO_INCREMENT, - `t` timestamp(6) NULL DEFAULT '2001-11-11 11:11:11.000000', - `b` blob /*!100301 COMPRESSED*/ DEFAULT NULL, -- `c` varchar(1033) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL, +- `c` varchar(1033) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci NOT NULL, - `u` int(11) DEFAULT NULL, - `m` enum('a','b','c') NOT NULL DEFAULT 'a' COMMENT 'absolute', - `i1` tinyint(4) DEFAULT NULL, @@ -51,14 +51,14 @@ - KEY `three` (`i1`,`i2`,`i3`), - PERIOD FOR SYSTEM_TIME (`s`, `e`), - CONSTRAINT `check_constr` CHECK (`u` > -1) --) ENGINE=X DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci WITH SYSTEM VERSIONING +-) ENGINE=X DEFAULT CHARSET=ucs2 COLLATE=ucs2_uca1400_ai_ci WITH SYSTEM VERSIONING -show create table t1; -Table Create Table -t1 CREATE TABLE `t1` ( - `x` int(11) NOT NULL AUTO_INCREMENT, - `t` timestamp(6) NULL DEFAULT '2001-11-11 11:11:11.000000', - `b` blob /*!100301 COMPRESSED*/ DEFAULT NULL, -- `c` varchar(1033) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL, +- `c` varchar(1033) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci NOT NULL, - `u` int(11) DEFAULT NULL, - `m` enum('a','b','c') NOT NULL DEFAULT 'a' COMMENT 'absolute', - `i1` tinyint(4) DEFAULT NULL, @@ -76,7 +76,7 @@ - KEY `three` (`i1`,`i2`,`i3`), - PERIOD FOR SYSTEM_TIME (`s`, `e`), - CONSTRAINT `check_constr` CHECK (`u` > -1) --) ENGINE=X DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci WITH SYSTEM VERSIONING +-) ENGINE=X DEFAULT CHARSET=ucs2 COLLATE=ucs2_uca1400_ai_ci WITH SYSTEM VERSIONING - PARTITION BY RANGE (`x`) -(PARTITION `p0` VALUES LESS THAN (10) ENGINE = X, - PARTITION `pn` VALUES LESS THAN MAXVALUE ENGINE = X) @@ -119,7 +119,7 @@ - `x` int(11) NOT NULL AUTO_INCREMENT, - `t` timestamp(6) NULL DEFAULT '2001-11-11 11:11:11.000000', - `b` blob /*!100301 COMPRESSED*/ DEFAULT NULL, -- `c` varchar(1033) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL, +- `c` varchar(1033) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci NOT NULL, - `u` int(11) DEFAULT NULL, - `m` enum('a','b','c') NOT NULL DEFAULT 'a' COMMENT 'absolute', - `i1` tinyint(4) DEFAULT NULL, @@ -137,7 +137,7 @@ - KEY `three` (`i1`,`i2`,`i3`), - PERIOD FOR SYSTEM_TIME (`s`, `e`), - CONSTRAINT `check_constr` CHECK (`u` > -1) --) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci WITH SYSTEM VERSIONING +-) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=ucs2 COLLATE=ucs2_uca1400_ai_ci WITH SYSTEM VERSIONING - PARTITION BY SYSTEM_TIME INTERVAL 1 HOUR STARTS TIMESTAMP'2000-01-01 00:00:00' AUTO -(PARTITION `p2` HISTORY ENGINE = DEFAULT_ENGINE, - PARTITION `pn` CURRENT ENGINE = DEFAULT_ENGINE) @@ -156,7 +156,7 @@ - `x` int(11) NOT NULL AUTO_INCREMENT, - `t` timestamp(6) NULL DEFAULT '2001-11-11 11:11:11.000000', - `b` blob /*!100301 COMPRESSED*/ DEFAULT NULL, -- `c` varchar(1033) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL, +- `c` varchar(1033) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci NOT NULL, - `u` int(11) DEFAULT NULL, - `m` enum('a','b','c') NOT NULL DEFAULT 'a' COMMENT 'absolute', - `i1` tinyint(4) DEFAULT NULL, @@ -174,7 +174,7 @@ - KEY `three` (`i1`,`i2`,`i3`), - PERIOD FOR SYSTEM_TIME (`s`, `e`), - CONSTRAINT `check_constr` CHECK (`u` > -1) --) ENGINE=DEFAULT_ENGINE AUTO_INCREMENT=10 DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci WITH SYSTEM VERSIONING +-) ENGINE=DEFAULT_ENGINE AUTO_INCREMENT=10 DEFAULT CHARSET=ucs2 COLLATE=ucs2_uca1400_ai_ci WITH SYSTEM VERSIONING - PARTITION BY SYSTEM_TIME INTERVAL 1 HOUR STARTS TIMESTAMP'2000-01-01 00:00:00' AUTO -(PARTITION `p2` HISTORY ENGINE = DEFAULT_ENGINE, - PARTITION `p1` HISTORY ENGINE = DEFAULT_ENGINE, @@ -191,7 +191,7 @@ - `x` int(11) NOT NULL AUTO_INCREMENT, - `t` timestamp(6) NULL DEFAULT '2001-11-11 11:11:11.000000', - `b` blob /*!100301 COMPRESSED*/ DEFAULT NULL, -- `c` varchar(1033) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL, +- `c` varchar(1033) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci NOT NULL, - `u` int(11) DEFAULT NULL, - `m` enum('a','b','c') NOT NULL DEFAULT 'a' COMMENT 'absolute', - `i1` tinyint(4) DEFAULT NULL, @@ -209,7 +209,7 @@ - KEY `three` (`i1`,`i2`,`i3`), - PERIOD FOR SYSTEM_TIME (`s`, `e`), - CONSTRAINT `check_constr` CHECK (`u` > -1) --) ENGINE=DEFAULT_ENGINE AUTO_INCREMENT=10 DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci WITH SYSTEM VERSIONING +-) ENGINE=DEFAULT_ENGINE AUTO_INCREMENT=10 DEFAULT CHARSET=ucs2 COLLATE=ucs2_uca1400_ai_ci WITH SYSTEM VERSIONING - PARTITION BY SYSTEM_TIME INTERVAL 1 HOUR STARTS TIMESTAMP'2000-01-01 00:00:00' AUTO -(PARTITION `p2` HISTORY ENGINE = DEFAULT_ENGINE, - PARTITION `p1` HISTORY ENGINE = DEFAULT_ENGINE, diff --git a/mysql-test/suite/versioning/r/partition.result b/mysql-test/suite/versioning/r/partition.result index 228ed14f44a..863a3c71d3e 100644 --- a/mysql-test/suite/versioning/r/partition.result +++ b/mysql-test/suite/versioning/r/partition.result @@ -2259,7 +2259,7 @@ tp1 CREATE TABLE `tp1` ( `x` int(11) NOT NULL AUTO_INCREMENT, `t` timestamp(6) NULL DEFAULT '2001-11-11 11:11:11.000000', `b` blob /*!100301 COMPRESSED*/ DEFAULT NULL, - `c` varchar(1033) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL, + `c` varchar(1033) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci NOT NULL, `u` int(11) DEFAULT NULL, `m` enum('a','b','c') NOT NULL DEFAULT 'a' COMMENT 'absolute', `i1` tinyint(4) DEFAULT NULL, @@ -2277,14 +2277,14 @@ tp1 CREATE TABLE `tp1` ( KEY `three` (`i1`,`i2`,`i3`), PERIOD FOR SYSTEM_TIME (`s`, `e`), CONSTRAINT `check_constr` CHECK (`u` > -1) -) ENGINE=X DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci WITH SYSTEM VERSIONING +) ENGINE=X DEFAULT CHARSET=ucs2 COLLATE=ucs2_uca1400_ai_ci WITH SYSTEM VERSIONING show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `x` int(11) NOT NULL AUTO_INCREMENT, `t` timestamp(6) NULL DEFAULT '2001-11-11 11:11:11.000000', `b` blob /*!100301 COMPRESSED*/ DEFAULT NULL, - `c` varchar(1033) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL, + `c` varchar(1033) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci NOT NULL, `u` int(11) DEFAULT NULL, `m` enum('a','b','c') NOT NULL DEFAULT 'a' COMMENT 'absolute', `i1` tinyint(4) DEFAULT NULL, @@ -2302,7 +2302,7 @@ t1 CREATE TABLE `t1` ( KEY `three` (`i1`,`i2`,`i3`), PERIOD FOR SYSTEM_TIME (`s`, `e`), CONSTRAINT `check_constr` CHECK (`u` > -1) -) ENGINE=X DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci WITH SYSTEM VERSIONING +) ENGINE=X DEFAULT CHARSET=ucs2 COLLATE=ucs2_uca1400_ai_ci WITH SYSTEM VERSIONING PARTITION BY RANGE (`x`) (PARTITION `p0` VALUES LESS THAN (10) ENGINE = X, PARTITION `pn` VALUES LESS THAN MAXVALUE ENGINE = X) @@ -2901,7 +2901,7 @@ t1 CREATE TABLE `t1` ( `x` int(11) NOT NULL AUTO_INCREMENT, `t` timestamp(6) NULL DEFAULT '2001-11-11 11:11:11.000000', `b` blob /*!100301 COMPRESSED*/ DEFAULT NULL, - `c` varchar(1033) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL, + `c` varchar(1033) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci NOT NULL, `u` int(11) DEFAULT NULL, `m` enum('a','b','c') NOT NULL DEFAULT 'a' COMMENT 'absolute', `i1` tinyint(4) DEFAULT NULL, @@ -2919,7 +2919,7 @@ t1 CREATE TABLE `t1` ( KEY `three` (`i1`,`i2`,`i3`), PERIOD FOR SYSTEM_TIME (`s`, `e`), CONSTRAINT `check_constr` CHECK (`u` > -1) -) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=ucs2 COLLATE=ucs2_uca1400_ai_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME INTERVAL 1 HOUR STARTS TIMESTAMP'2000-01-01 00:00:00' AUTO (PARTITION `p2` HISTORY ENGINE = DEFAULT_ENGINE, PARTITION `pn` CURRENT ENGINE = DEFAULT_ENGINE) @@ -2938,7 +2938,7 @@ t1 CREATE TABLE `t1` ( `x` int(11) NOT NULL AUTO_INCREMENT, `t` timestamp(6) NULL DEFAULT '2001-11-11 11:11:11.000000', `b` blob /*!100301 COMPRESSED*/ DEFAULT NULL, - `c` varchar(1033) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL, + `c` varchar(1033) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci NOT NULL, `u` int(11) DEFAULT NULL, `m` enum('a','b','c') NOT NULL DEFAULT 'a' COMMENT 'absolute', `i1` tinyint(4) DEFAULT NULL, @@ -2956,7 +2956,7 @@ t1 CREATE TABLE `t1` ( KEY `three` (`i1`,`i2`,`i3`), PERIOD FOR SYSTEM_TIME (`s`, `e`), CONSTRAINT `check_constr` CHECK (`u` > -1) -) ENGINE=DEFAULT_ENGINE AUTO_INCREMENT=10 DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE AUTO_INCREMENT=10 DEFAULT CHARSET=ucs2 COLLATE=ucs2_uca1400_ai_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME INTERVAL 1 HOUR STARTS TIMESTAMP'2000-01-01 00:00:00' AUTO (PARTITION `p2` HISTORY ENGINE = DEFAULT_ENGINE, PARTITION `p1` HISTORY ENGINE = DEFAULT_ENGINE, @@ -2973,7 +2973,7 @@ t1 CREATE TABLE `t1` ( `x` int(11) NOT NULL AUTO_INCREMENT, `t` timestamp(6) NULL DEFAULT '2001-11-11 11:11:11.000000', `b` blob /*!100301 COMPRESSED*/ DEFAULT NULL, - `c` varchar(1033) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL, + `c` varchar(1033) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci NOT NULL, `u` int(11) DEFAULT NULL, `m` enum('a','b','c') NOT NULL DEFAULT 'a' COMMENT 'absolute', `i1` tinyint(4) DEFAULT NULL, @@ -2991,7 +2991,7 @@ t1 CREATE TABLE `t1` ( KEY `three` (`i1`,`i2`,`i3`), PERIOD FOR SYSTEM_TIME (`s`, `e`), CONSTRAINT `check_constr` CHECK (`u` > -1) -) ENGINE=DEFAULT_ENGINE AUTO_INCREMENT=10 DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci WITH SYSTEM VERSIONING +) ENGINE=DEFAULT_ENGINE AUTO_INCREMENT=10 DEFAULT CHARSET=ucs2 COLLATE=ucs2_uca1400_ai_ci WITH SYSTEM VERSIONING PARTITION BY SYSTEM_TIME INTERVAL 1 HOUR STARTS TIMESTAMP'2000-01-01 00:00:00' AUTO (PARTITION `p2` HISTORY ENGINE = DEFAULT_ENGINE, PARTITION `p1` HISTORY ENGINE = DEFAULT_ENGINE, diff --git a/plugin/type_inet/mysql-test/type_inet/binlog_table_map_optional_metadata_type_inet4.result b/plugin/type_inet/mysql-test/type_inet/binlog_table_map_optional_metadata_type_inet4.result index f3694903793..1eeb47bd47a 100644 --- a/plugin/type_inet/mysql-test/type_inet/binlog_table_map_optional_metadata_type_inet4.result +++ b/plugin/type_inet/mysql-test/type_inet/binlog_table_map_optional_metadata_type_inet4.result @@ -43,7 +43,7 @@ CREATE TABLE t1 (a INET4, b CHAR(16) CHARACTER SET latin1, c CHAR(16) CHARACTER INSERT INTO t1 VALUES('0.0.0.0','',''); # Columns(BINARY(4), # CHAR(16) CHARSET latin1 COLLATE latin1_swedish_ci, -# CHAR(16) CHARSET utf8mb3 COLLATE utf8mb3_general_ci) +# CHAR(16) CHARSET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci) DROP TABLE t1; RESET MASTER; RESET MASTER; @@ -52,7 +52,7 @@ CREATE TABLE t1 (a INET4, b CHAR(16) CHARACTER SET latin1, c CHAR(16) CHARACTER INSERT INTO t1 VALUES('0.0.0.0','',''); # Columns(`a` BINARY(4), # `b` CHAR(16) CHARSET latin1 COLLATE latin1_swedish_ci, -# `c` CHAR(16) CHARSET utf8mb3 COLLATE utf8mb3_general_ci) +# `c` CHAR(16) CHARSET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci) DROP TABLE t1; RESET MASTER; SET GLOBAL binlog_row_metadata = DEFAULT; diff --git a/plugin/type_inet/mysql-test/type_inet/binlog_table_map_optional_metadata_type_inet6.result b/plugin/type_inet/mysql-test/type_inet/binlog_table_map_optional_metadata_type_inet6.result index 79356bee6e2..b0407b87074 100644 --- a/plugin/type_inet/mysql-test/type_inet/binlog_table_map_optional_metadata_type_inet6.result +++ b/plugin/type_inet/mysql-test/type_inet/binlog_table_map_optional_metadata_type_inet6.result @@ -42,7 +42,7 @@ CREATE TABLE t1 (a INET6, b CHAR(16) CHARACTER SET latin1, c CHAR(16) CHARACTER INSERT INTO t1 VALUES('::','',''); # Columns(BINARY(16), # CHAR(16) CHARSET latin1 COLLATE latin1_swedish_ci, -# CHAR(16) CHARSET utf8mb3 COLLATE utf8mb3_general_ci) +# CHAR(16) CHARSET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci) DROP TABLE t1; RESET MASTER; RESET MASTER; @@ -51,7 +51,7 @@ CREATE TABLE t1 (a INET6, b CHAR(16) CHARACTER SET latin1, c CHAR(16) CHARACTER INSERT INTO t1 VALUES('::','',''); # Columns(`a` BINARY(16), # `b` CHAR(16) CHARSET latin1 COLLATE latin1_swedish_ci, -# `c` CHAR(16) CHARSET utf8mb3 COLLATE utf8mb3_general_ci) +# `c` CHAR(16) CHARSET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci) DROP TABLE t1; RESET MASTER; SET GLOBAL binlog_row_metadata = DEFAULT; diff --git a/plugin/type_inet/mysql-test/type_inet/type_inet4.result b/plugin/type_inet/mysql-test/type_inet/type_inet4.result index c44ac7ee34a..8d1cbb6e7cb 100644 --- a/plugin/type_inet/mysql-test/type_inet/type_inet4.result +++ b/plugin/type_inet/mysql-test/type_inet/type_inet4.result @@ -1020,9 +1020,9 @@ FROM t1; SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( - `c1` varchar(16) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL, - `c2` varchar(16) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL, - `c3` varchar(16) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL + `c1` varchar(16) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL, + `c2` varchar(16) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL, + `c3` varchar(16) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t2; CREATE TABLE t2 AS SELECT diff --git a/plugin/type_inet/mysql-test/type_inet/type_inet6.result b/plugin/type_inet/mysql-test/type_inet/type_inet6.result index 17cf4544c93..249d4b878b2 100644 --- a/plugin/type_inet/mysql-test/type_inet/type_inet6.result +++ b/plugin/type_inet/mysql-test/type_inet/type_inet6.result @@ -1008,9 +1008,9 @@ FROM t1; SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( - `c1` varchar(40) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL, - `c2` varchar(40) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL, - `c3` varchar(40) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL + `c1` varchar(40) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL, + `c2` varchar(40) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL, + `c3` varchar(40) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t2; CREATE TABLE t2 AS SELECT diff --git a/plugin/type_uuid/mysql-test/type_uuid/binlog_table_map_optional_metadata_type_uuid.result b/plugin/type_uuid/mysql-test/type_uuid/binlog_table_map_optional_metadata_type_uuid.result index 3932470cf64..7a04004ce12 100644 --- a/plugin/type_uuid/mysql-test/type_uuid/binlog_table_map_optional_metadata_type_uuid.result +++ b/plugin/type_uuid/mysql-test/type_uuid/binlog_table_map_optional_metadata_type_uuid.result @@ -42,7 +42,7 @@ CREATE TABLE t1 (a UUID, b CHAR(16) CHARACTER SET latin1, c CHAR(16) CHARACTER S INSERT INTO t1 VALUES('12334567-8888-9999-aaaa-000000000000','',''); # Columns(BINARY(16), # CHAR(16) CHARSET latin1 COLLATE latin1_swedish_ci, -# CHAR(16) CHARSET utf8mb3 COLLATE utf8mb3_general_ci) +# CHAR(16) CHARSET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci) DROP TABLE t1; RESET MASTER; RESET MASTER; @@ -51,7 +51,7 @@ CREATE TABLE t1 (a UUID, b CHAR(16) CHARACTER SET latin1, c CHAR(16) CHARACTER S INSERT INTO t1 VALUES('12334567-8888-9999-aaaa-000000000000','',''); # Columns(`a` BINARY(16), # `b` CHAR(16) CHARSET latin1 COLLATE latin1_swedish_ci, -# `c` CHAR(16) CHARSET utf8mb3 COLLATE utf8mb3_general_ci) +# `c` CHAR(16) CHARSET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci) DROP TABLE t1; RESET MASTER; SET GLOBAL binlog_row_metadata = DEFAULT; diff --git a/plugin/type_uuid/mysql-test/type_uuid/type_uuid.result b/plugin/type_uuid/mysql-test/type_uuid/type_uuid.result index 7fb9d912c10..88134d40e21 100644 --- a/plugin/type_uuid/mysql-test/type_uuid/type_uuid.result +++ b/plugin/type_uuid/mysql-test/type_uuid/type_uuid.result @@ -2145,9 +2145,9 @@ FROM t1; SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( - `c1` varchar(36) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL, - `c2` varchar(36) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL, - `c3` varchar(36) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL + `c1` varchar(36) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL, + `c2` varchar(36) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL, + `c3` varchar(36) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t2; CREATE TABLE t2 AS SELECT diff --git a/scripts/mariadb_performance_tables.sql b/scripts/mariadb_performance_tables.sql index 3a7d0ef5261..bf5f86489cc 100644 --- a/scripts/mariadb_performance_tables.sql +++ b/scripts/mariadb_performance_tables.sql @@ -47,7 +47,7 @@ PREPARE stmt FROM @str; EXECUTE stmt; DROP PREPARE stmt; -SET @cmd= "CREATE DATABASE performance_schema character set utf8mb3"; +SET @cmd= "CREATE DATABASE performance_schema character set utf8mb3 collate utf8mb3_general_ci"; SET @str = IF(@broken_pfs = 0, @cmd, 'SET @dummy = 0'); PREPARE stmt FROM @str; diff --git a/scripts/mariadb_system_tables.sql b/scripts/mariadb_system_tables.sql index d12f0b48e4f..47ffdfe190c 100644 --- a/scripts/mariadb_system_tables.sql +++ b/scripts/mariadb_system_tables.sql @@ -107,7 +107,7 @@ CREATE TABLE IF NOT EXISTS func ( name char(64) binary DEFAULT '' NOT NULL, ret CREATE TABLE IF NOT EXISTS plugin ( name varchar(64) DEFAULT '' NOT NULL, dl varchar(128) DEFAULT '' NOT NULL, PRIMARY KEY (name) ) engine=Aria transactional=1 CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci comment='MySQL plugins'; -CREATE TABLE IF NOT EXISTS servers ( Server_name char(64) NOT NULL DEFAULT '', Host varchar(2048) NOT NULL DEFAULT '', Db char(64) NOT NULL DEFAULT '', Username char(128) NOT NULL DEFAULT '', Password char(64) NOT NULL DEFAULT '', Port INT(4) NOT NULL DEFAULT '0', Socket char(64) NOT NULL DEFAULT '', Wrapper char(64) NOT NULL DEFAULT '', Owner varchar(512) NOT NULL DEFAULT '', PRIMARY KEY (Server_name)) engine=Aria transactional=1 CHARACTER SET utf8mb3 comment='MySQL Foreign Servers table'; +CREATE TABLE IF NOT EXISTS servers ( Server_name char(64) NOT NULL DEFAULT '', Host varchar(2048) NOT NULL DEFAULT '', Db char(64) NOT NULL DEFAULT '', Username char(128) NOT NULL DEFAULT '', Password char(64) NOT NULL DEFAULT '', Port INT(4) NOT NULL DEFAULT '0', Socket char(64) NOT NULL DEFAULT '', Wrapper char(64) NOT NULL DEFAULT '', Owner varchar(512) NOT NULL DEFAULT '', PRIMARY KEY (Server_name)) engine=Aria transactional=1 CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci comment='MySQL Foreign Servers table'; CREATE TABLE IF NOT EXISTS tables_priv ( Host char(255) binary DEFAULT '' NOT NULL, Db char(64) binary DEFAULT '' NOT NULL, User char(128) binary DEFAULT '' NOT NULL, Table_name char(64) binary DEFAULT '' NOT NULL, Grantor varchar(384) DEFAULT '' NOT NULL, Timestamp timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, Table_priv set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter','Create View','Show view','Trigger','Delete versioning rows') COLLATE utf8mb3_general_ci DEFAULT '' NOT NULL, Column_priv set('Select','Insert','Update','References') COLLATE utf8mb3_general_ci DEFAULT '' NOT NULL, PRIMARY KEY (Host,Db,User,Table_name), KEY Grantor (Grantor) ) engine=Aria transactional=1 CHARACTER SET utf8mb3 COLLATE utf8mb3_bin comment='Table privileges'; @@ -120,40 +120,40 @@ DROP TABLE tmp_user_sys; CREATE TABLE IF NOT EXISTS columns_priv ( Host char(255) binary DEFAULT '' NOT NULL, Db char(64) binary DEFAULT '' NOT NULL, User char(128) binary DEFAULT '' NOT NULL, Table_name char(64) binary DEFAULT '' NOT NULL, Column_name char(64) binary DEFAULT '' NOT NULL, Timestamp timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, Column_priv set('Select','Insert','Update','References') COLLATE utf8mb3_general_ci DEFAULT '' NOT NULL, PRIMARY KEY (Host,Db,User,Table_name,Column_name) ) engine=Aria transactional=1 CHARACTER SET utf8mb3 COLLATE utf8mb3_bin comment='Column privileges'; -CREATE TABLE IF NOT EXISTS help_topic ( help_topic_id int unsigned not null, name char(64) not null, help_category_id smallint unsigned not null, description text not null, example text not null, url text not null, primary key (help_topic_id), unique index (name) ) engine=Aria transactional=0 CHARACTER SET utf8mb3 comment='help topics'; +CREATE TABLE IF NOT EXISTS help_topic ( help_topic_id int unsigned not null, name char(64) not null, help_category_id smallint unsigned not null, description text not null, example text not null, url text not null, primary key (help_topic_id), unique index (name) ) engine=Aria transactional=0 CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci comment='help topics'; -CREATE TABLE IF NOT EXISTS help_category ( help_category_id smallint unsigned not null, name char(64) not null, parent_category_id smallint unsigned null, url text not null, primary key (help_category_id), unique index (name) ) engine=Aria transactional=0 CHARACTER SET utf8mb3 comment='help categories'; +CREATE TABLE IF NOT EXISTS help_category ( help_category_id smallint unsigned not null, name char(64) not null, parent_category_id smallint unsigned null, url text not null, primary key (help_category_id), unique index (name) ) engine=Aria transactional=0 CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci comment='help categories'; -CREATE TABLE IF NOT EXISTS help_relation ( help_topic_id int unsigned not null references help_topic, help_keyword_id int unsigned not null references help_keyword, primary key (help_keyword_id, help_topic_id) ) engine=Aria transactional=0 CHARACTER SET utf8mb3 comment='keyword-topic relation'; +CREATE TABLE IF NOT EXISTS help_relation ( help_topic_id int unsigned not null references help_topic, help_keyword_id int unsigned not null references help_keyword, primary key (help_keyword_id, help_topic_id) ) engine=Aria transactional=0 CHARACTER SET utf8mb3 CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci comment='keyword-topic relation'; -CREATE TABLE IF NOT EXISTS help_keyword ( help_keyword_id int unsigned not null, name char(64) not null, primary key (help_keyword_id), unique index (name) ) engine=Aria transactional=0 CHARACTER SET utf8mb3 comment='help keywords'; +CREATE TABLE IF NOT EXISTS help_keyword ( help_keyword_id int unsigned not null, name char(64) not null, primary key (help_keyword_id), unique index (name) ) engine=Aria transactional=0 CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci comment='help keywords'; -CREATE TABLE IF NOT EXISTS time_zone_name ( Name char(64) NOT NULL, Time_zone_id int unsigned NOT NULL, PRIMARY KEY /*Name*/ (Name) ) engine=Aria transactional=1 CHARACTER SET utf8mb3 comment='Time zone names'; +CREATE TABLE IF NOT EXISTS time_zone_name ( Name char(64) NOT NULL, Time_zone_id int unsigned NOT NULL, PRIMARY KEY /*Name*/ (Name) ) engine=Aria transactional=1 CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci comment='Time zone names'; -CREATE TABLE IF NOT EXISTS time_zone ( Time_zone_id int unsigned NOT NULL auto_increment, Use_leap_seconds enum('Y','N') COLLATE utf8mb3_general_ci DEFAULT 'N' NOT NULL, PRIMARY KEY /*TzId*/ (Time_zone_id) ) engine=Aria transactional=1 CHARACTER SET utf8mb3 comment='Time zones'; +CREATE TABLE IF NOT EXISTS time_zone ( Time_zone_id int unsigned NOT NULL auto_increment, Use_leap_seconds enum('Y','N') COLLATE utf8mb3_general_ci DEFAULT 'N' NOT NULL, PRIMARY KEY /*TzId*/ (Time_zone_id) ) engine=Aria transactional=1 CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci comment='Time zones'; -CREATE TABLE IF NOT EXISTS time_zone_transition ( Time_zone_id int unsigned NOT NULL, Transition_time bigint signed NOT NULL, Transition_type_id int unsigned NOT NULL, PRIMARY KEY /*TzIdTranTime*/ (Time_zone_id, Transition_time) ) engine=Aria transactional=1 CHARACTER SET utf8mb3 comment='Time zone transitions'; +CREATE TABLE IF NOT EXISTS time_zone_transition ( Time_zone_id int unsigned NOT NULL, Transition_time bigint signed NOT NULL, Transition_type_id int unsigned NOT NULL, PRIMARY KEY /*TzIdTranTime*/ (Time_zone_id, Transition_time) ) engine=Aria transactional=1 CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci comment='Time zone transitions'; -CREATE TABLE IF NOT EXISTS time_zone_transition_type ( Time_zone_id int unsigned NOT NULL, Transition_type_id int unsigned NOT NULL, `Offset` int signed DEFAULT 0 NOT NULL, Is_DST tinyint unsigned DEFAULT 0 NOT NULL, Abbreviation char(8) DEFAULT '' NOT NULL, PRIMARY KEY /*TzIdTrTId*/ (Time_zone_id, Transition_type_id) ) engine=Aria transactional=1 CHARACTER SET utf8mb3 comment='Time zone transition types'; +CREATE TABLE IF NOT EXISTS time_zone_transition_type ( Time_zone_id int unsigned NOT NULL, Transition_type_id int unsigned NOT NULL, `Offset` int signed DEFAULT 0 NOT NULL, Is_DST tinyint unsigned DEFAULT 0 NOT NULL, Abbreviation char(8) DEFAULT '' NOT NULL, PRIMARY KEY /*TzIdTrTId*/ (Time_zone_id, Transition_type_id) ) engine=Aria transactional=1 CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci comment='Time zone transition types'; -CREATE TABLE IF NOT EXISTS time_zone_leap_second ( Transition_time bigint signed NOT NULL, Correction int signed NOT NULL, PRIMARY KEY /*TranTime*/ (Transition_time) ) engine=Aria transactional=1 CHARACTER SET utf8mb3 comment='Leap seconds information for time zones'; +CREATE TABLE IF NOT EXISTS time_zone_leap_second ( Transition_time bigint signed NOT NULL, Correction int signed NOT NULL, PRIMARY KEY /*TranTime*/ (Transition_time) ) engine=Aria transactional=1 CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci comment='Leap seconds information for time zones'; -CREATE TABLE IF NOT EXISTS proc (db char(64) collate utf8mb3_bin DEFAULT '' NOT NULL, name char(64) DEFAULT '' NOT NULL, type enum('FUNCTION','PROCEDURE','PACKAGE','PACKAGE BODY') NOT NULL, specific_name char(64) DEFAULT '' NOT NULL, language enum('SQL') DEFAULT 'SQL' NOT NULL, sql_data_access enum( 'CONTAINS_SQL', 'NO_SQL', 'READS_SQL_DATA', 'MODIFIES_SQL_DATA') DEFAULT 'CONTAINS_SQL' NOT NULL, is_deterministic enum('YES','NO') DEFAULT 'NO' NOT NULL, security_type enum('INVOKER','DEFINER') DEFAULT 'DEFINER' NOT NULL, param_list blob NOT NULL, returns longblob NOT NULL, body longblob NOT NULL, definer varchar(384) collate utf8mb3_bin DEFAULT '' NOT NULL, created timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, modified timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', sql_mode set( 'REAL_AS_FLOAT', 'PIPES_AS_CONCAT', 'ANSI_QUOTES', 'IGNORE_SPACE', 'IGNORE_BAD_TABLE_OPTIONS', 'ONLY_FULL_GROUP_BY', 'NO_UNSIGNED_SUBTRACTION', 'NO_DIR_IN_CREATE', 'POSTGRESQL', 'ORACLE', 'MSSQL', 'DB2', 'MAXDB', 'NO_KEY_OPTIONS', 'NO_TABLE_OPTIONS', 'NO_FIELD_OPTIONS', 'MYSQL323', 'MYSQL40', 'ANSI', 'NO_AUTO_VALUE_ON_ZERO', 'NO_BACKSLASH_ESCAPES', 'STRICT_TRANS_TABLES', 'STRICT_ALL_TABLES', 'NO_ZERO_IN_DATE', 'NO_ZERO_DATE', 'INVALID_DATES', 'ERROR_FOR_DIVISION_BY_ZERO', 'TRADITIONAL', 'NO_AUTO_CREATE_USER', 'HIGH_NOT_PRECEDENCE', 'NO_ENGINE_SUBSTITUTION', 'PAD_CHAR_TO_FULL_LENGTH', 'EMPTY_STRING_IS_NULL', 'SIMULTANEOUS_ASSIGNMENT', 'TIME_ROUND_FRACTIONAL') DEFAULT '' NOT NULL, comment text collate utf8mb3_bin NOT NULL, character_set_client char(32) collate utf8mb3_bin, collation_connection char(64) collate utf8mb3_bin, db_collation char(64) collate utf8mb3_bin, body_utf8 longblob, aggregate enum('NONE', 'GROUP') DEFAULT 'NONE' NOT NULL, PRIMARY KEY (db,name,type)) engine=Aria transactional=1 character set utf8mb3 comment='Stored Procedures'; +CREATE TABLE IF NOT EXISTS proc (db char(64) collate utf8mb3_bin DEFAULT '' NOT NULL, name char(64) DEFAULT '' NOT NULL, type enum('FUNCTION','PROCEDURE','PACKAGE','PACKAGE BODY') NOT NULL, specific_name char(64) DEFAULT '' NOT NULL, language enum('SQL') DEFAULT 'SQL' NOT NULL, sql_data_access enum( 'CONTAINS_SQL', 'NO_SQL', 'READS_SQL_DATA', 'MODIFIES_SQL_DATA') DEFAULT 'CONTAINS_SQL' NOT NULL, is_deterministic enum('YES','NO') DEFAULT 'NO' NOT NULL, security_type enum('INVOKER','DEFINER') DEFAULT 'DEFINER' NOT NULL, param_list blob NOT NULL, returns longblob NOT NULL, body longblob NOT NULL, definer varchar(384) collate utf8mb3_bin DEFAULT '' NOT NULL, created timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, modified timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', sql_mode set( 'REAL_AS_FLOAT', 'PIPES_AS_CONCAT', 'ANSI_QUOTES', 'IGNORE_SPACE', 'IGNORE_BAD_TABLE_OPTIONS', 'ONLY_FULL_GROUP_BY', 'NO_UNSIGNED_SUBTRACTION', 'NO_DIR_IN_CREATE', 'POSTGRESQL', 'ORACLE', 'MSSQL', 'DB2', 'MAXDB', 'NO_KEY_OPTIONS', 'NO_TABLE_OPTIONS', 'NO_FIELD_OPTIONS', 'MYSQL323', 'MYSQL40', 'ANSI', 'NO_AUTO_VALUE_ON_ZERO', 'NO_BACKSLASH_ESCAPES', 'STRICT_TRANS_TABLES', 'STRICT_ALL_TABLES', 'NO_ZERO_IN_DATE', 'NO_ZERO_DATE', 'INVALID_DATES', 'ERROR_FOR_DIVISION_BY_ZERO', 'TRADITIONAL', 'NO_AUTO_CREATE_USER', 'HIGH_NOT_PRECEDENCE', 'NO_ENGINE_SUBSTITUTION', 'PAD_CHAR_TO_FULL_LENGTH', 'EMPTY_STRING_IS_NULL', 'SIMULTANEOUS_ASSIGNMENT', 'TIME_ROUND_FRACTIONAL') DEFAULT '' NOT NULL, comment text collate utf8mb3_bin NOT NULL, character_set_client char(32) collate utf8mb3_bin, collation_connection char(64) collate utf8mb3_bin, db_collation char(64) collate utf8mb3_bin, body_utf8 longblob, aggregate enum('NONE', 'GROUP') DEFAULT 'NONE' NOT NULL, PRIMARY KEY (db,name,type)) engine=Aria transactional=1 character set utf8mb3 COLLATE utf8mb3_general_ci comment='Stored Procedures'; CREATE TABLE IF NOT EXISTS procs_priv ( Host char(255) binary DEFAULT '' NOT NULL, Db char(64) binary DEFAULT '' NOT NULL, User char(128) binary DEFAULT '' NOT NULL, Routine_name char(64) COLLATE utf8mb3_general_ci DEFAULT '' NOT NULL, Routine_type enum('FUNCTION','PROCEDURE','PACKAGE','PACKAGE BODY') NOT NULL, Grantor varchar(384) DEFAULT '' NOT NULL, Proc_priv set('Execute','Alter Routine','Grant','Show Create Routine') COLLATE utf8mb3_general_ci DEFAULT '' NOT NULL, Timestamp timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, PRIMARY KEY (Host,Db,User,Routine_name,Routine_type), KEY Grantor (Grantor) ) engine=Aria transactional=1 CHARACTER SET utf8mb3 COLLATE utf8mb3_bin comment='Procedure privileges'; -- Create general_log if CSV is enabled. SET @have_csv = (SELECT support FROM information_schema.engines WHERE engine = 'CSV'); -SET @str = IF (@have_csv = 'YES', 'CREATE TABLE IF NOT EXISTS general_log (event_time TIMESTAMP(6) NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, user_host MEDIUMTEXT NOT NULL, thread_id BIGINT(21) UNSIGNED NOT NULL, server_id INTEGER UNSIGNED NOT NULL, command_type VARCHAR(64) NOT NULL, argument MEDIUMTEXT NOT NULL) engine=CSV CHARACTER SET utf8mb3 comment="General log"', 'SET @dummy = 0'); +SET @str = IF (@have_csv = 'YES', 'CREATE TABLE IF NOT EXISTS general_log (event_time TIMESTAMP(6) NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, user_host MEDIUMTEXT NOT NULL, thread_id BIGINT(21) UNSIGNED NOT NULL, server_id INTEGER UNSIGNED NOT NULL, command_type VARCHAR(64) NOT NULL, argument MEDIUMTEXT NOT NULL) engine=CSV CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci comment="General log"', 'SET @dummy = 0'); PREPARE stmt FROM @str; EXECUTE stmt; @@ -161,13 +161,13 @@ DROP PREPARE stmt; -- Create slow_log if CSV is enabled. -SET @str = IF (@have_csv = 'YES', 'CREATE TABLE IF NOT EXISTS slow_log (start_time TIMESTAMP(6) NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, user_host MEDIUMTEXT NOT NULL, query_time TIME(6) NOT NULL, lock_time TIME(6) NOT NULL, rows_sent BIGINT UNSIGNED NOT NULL, rows_examined BIGINT UNSIGNED NOT NULL, db VARCHAR(512) NOT NULL, last_insert_id INTEGER NOT NULL, insert_id INTEGER NOT NULL, server_id INTEGER UNSIGNED NOT NULL, sql_text MEDIUMTEXT NOT NULL, thread_id BIGINT(21) UNSIGNED NOT NULL, rows_affected BIGINT UNSIGNED NOT NULL) engine=CSV CHARACTER SET utf8mb3 comment="Slow log"', 'SET @dummy = 0'); +SET @str = IF (@have_csv = 'YES', 'CREATE TABLE IF NOT EXISTS slow_log (start_time TIMESTAMP(6) NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, user_host MEDIUMTEXT NOT NULL, query_time TIME(6) NOT NULL, lock_time TIME(6) NOT NULL, rows_sent BIGINT UNSIGNED NOT NULL, rows_examined BIGINT UNSIGNED NOT NULL, db VARCHAR(512) NOT NULL, last_insert_id INTEGER NOT NULL, insert_id INTEGER NOT NULL, server_id INTEGER UNSIGNED NOT NULL, sql_text MEDIUMTEXT NOT NULL, thread_id BIGINT(21) UNSIGNED NOT NULL, rows_affected BIGINT UNSIGNED NOT NULL) engine=CSV CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci comment="Slow log"', 'SET @dummy = 0'); PREPARE stmt FROM @str; EXECUTE stmt; DROP PREPARE stmt; -CREATE TABLE IF NOT EXISTS event ( db char(64) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin NOT NULL default '', name char(64) CHARACTER SET utf8mb3 NOT NULL default '', body longblob NOT NULL, definer varchar(384) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin NOT NULL default '', execute_at DATETIME default NULL, interval_value int(11) default NULL, interval_field ENUM('YEAR','QUARTER','MONTH','DAY','HOUR','MINUTE','WEEK','SECOND','MICROSECOND','YEAR_MONTH','DAY_HOUR','DAY_MINUTE','DAY_SECOND','HOUR_MINUTE','HOUR_SECOND','MINUTE_SECOND','DAY_MICROSECOND','HOUR_MICROSECOND','MINUTE_MICROSECOND','SECOND_MICROSECOND') default NULL, created TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, modified TIMESTAMP NOT NULL DEFAULT '0000-00-00 00:00:00', last_executed DATETIME default NULL, starts DATETIME default NULL, ends DATETIME default NULL, status ENUM('ENABLED','DISABLED','SLAVESIDE_DISABLED') NOT NULL default 'ENABLED', on_completion ENUM('DROP','PRESERVE') NOT NULL default 'DROP', sql_mode set('REAL_AS_FLOAT','PIPES_AS_CONCAT','ANSI_QUOTES','IGNORE_SPACE','IGNORE_BAD_TABLE_OPTIONS','ONLY_FULL_GROUP_BY','NO_UNSIGNED_SUBTRACTION','NO_DIR_IN_CREATE','POSTGRESQL','ORACLE','MSSQL','DB2','MAXDB','NO_KEY_OPTIONS','NO_TABLE_OPTIONS','NO_FIELD_OPTIONS','MYSQL323','MYSQL40','ANSI','NO_AUTO_VALUE_ON_ZERO','NO_BACKSLASH_ESCAPES','STRICT_TRANS_TABLES','STRICT_ALL_TABLES','NO_ZERO_IN_DATE','NO_ZERO_DATE','INVALID_DATES','ERROR_FOR_DIVISION_BY_ZERO','TRADITIONAL','NO_AUTO_CREATE_USER','HIGH_NOT_PRECEDENCE','NO_ENGINE_SUBSTITUTION','PAD_CHAR_TO_FULL_LENGTH','EMPTY_STRING_IS_NULL','SIMULTANEOUS_ASSIGNMENT','TIME_ROUND_FRACTIONAL') DEFAULT '' NOT NULL, comment char(64) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin NOT NULL default '', originator INTEGER UNSIGNED NOT NULL, time_zone char(64) CHARACTER SET latin1 NOT NULL DEFAULT 'SYSTEM', character_set_client char(32) collate utf8mb3_bin, collation_connection char(64) collate utf8mb3_bin, db_collation char(64) collate utf8mb3_bin, body_utf8 longblob, PRIMARY KEY (db, name) ) engine=Aria transactional=1 DEFAULT CHARSET=utf8mb3 COMMENT 'Events'; +CREATE TABLE IF NOT EXISTS event ( db char(64) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin NOT NULL default '', name char(64) NOT NULL default '', body longblob NOT NULL, definer varchar(384) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin NOT NULL default '', execute_at DATETIME default NULL, interval_value int(11) default NULL, interval_field ENUM('YEAR','QUARTER','MONTH','DAY','HOUR','MINUTE','WEEK','SECOND','MICROSECOND','YEAR_MONTH','DAY_HOUR','DAY_MINUTE','DAY_SECOND','HOUR_MINUTE','HOUR_SECOND','MINUTE_SECOND','DAY_MICROSECOND','HOUR_MICROSECOND','MINUTE_MICROSECOND','SECOND_MICROSECOND') default NULL, created TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, modified TIMESTAMP NOT NULL DEFAULT '0000-00-00 00:00:00', last_executed DATETIME default NULL, starts DATETIME default NULL, ends DATETIME default NULL, status ENUM('ENABLED','DISABLED','SLAVESIDE_DISABLED') NOT NULL default 'ENABLED', on_completion ENUM('DROP','PRESERVE') NOT NULL default 'DROP', sql_mode set('REAL_AS_FLOAT','PIPES_AS_CONCAT','ANSI_QUOTES','IGNORE_SPACE','IGNORE_BAD_TABLE_OPTIONS','ONLY_FULL_GROUP_BY','NO_UNSIGNED_SUBTRACTION','NO_DIR_IN_CREATE','POSTGRESQL','ORACLE','MSSQL','DB2','MAXDB','NO_KEY_OPTIONS','NO_TABLE_OPTIONS','NO_FIELD_OPTIONS','MYSQL323','MYSQL40','ANSI','NO_AUTO_VALUE_ON_ZERO','NO_BACKSLASH_ESCAPES','STRICT_TRANS_TABLES','STRICT_ALL_TABLES','NO_ZERO_IN_DATE','NO_ZERO_DATE','INVALID_DATES','ERROR_FOR_DIVISION_BY_ZERO','TRADITIONAL','NO_AUTO_CREATE_USER','HIGH_NOT_PRECEDENCE','NO_ENGINE_SUBSTITUTION','PAD_CHAR_TO_FULL_LENGTH','EMPTY_STRING_IS_NULL','SIMULTANEOUS_ASSIGNMENT','TIME_ROUND_FRACTIONAL') DEFAULT '' NOT NULL, comment char(64) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin NOT NULL default '', originator INTEGER UNSIGNED NOT NULL, time_zone char(64) CHARACTER SET latin1 COLLATE latin1_swedish_ci NOT NULL DEFAULT 'SYSTEM', character_set_client char(32) collate utf8mb3_bin, collation_connection char(64) collate utf8mb3_bin, db_collation char(64) collate utf8mb3_bin, body_utf8 longblob, PRIMARY KEY (db, name) ) engine=Aria transactional=1 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci COMMENT 'Events'; SET @create_innodb_table_stats="CREATE TABLE IF NOT EXISTS innodb_table_stats ( database_name VARCHAR(64) NOT NULL, diff --git a/scripts/mariadb_system_tables_fix.sql b/scripts/mariadb_system_tables_fix.sql index dfa8b08ec33..cfa124d38ab 100644 --- a/scripts/mariadb_system_tables_fix.sql +++ b/scripts/mariadb_system_tables_fix.sql @@ -64,14 +64,16 @@ ALTER TABLE tables_priv ENGINE=Aria transactional=1; ALTER TABLE columns_priv ENGINE=Aria transactional=1; ALTER TABLE roles_mapping ENGINE=Aria transactional=1; ALTER TABLE plugin ENGINE=Aria transactional=1; -ALTER TABLE servers ENGINE=Aria transactional=1; +ALTER TABLE servers ENGINE=Aria transactional=1, + CONVERT TO CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci; ALTER TABLE time_zone_name ENGINE=Aria transactional=1; ALTER TABLE time_zone ENGINE=Aria transactional=1; ALTER TABLE time_zone_transition ENGINE=Aria transactional=1; ALTER TABLE time_zone_transition_type ENGINE=Aria transactional=1; ALTER TABLE time_zone_leap_second ENGINE=Aria transactional=1; ALTER TABLE proc ENGINE=Aria transactional=1; -ALTER TABLE event ENGINE=Aria transactional=1; +ALTER TABLE event ENGINE=Aria transactional=1, + DEFAULT CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci; ALTER TABLE proxies_priv ENGINE=Aria transactional=1; -- The following tables doesn't have to be transactional @@ -218,6 +220,12 @@ ALTER TABLE user MODIFY User char(128) binary NOT NULL default '', ENGINE=Aria, CONVERT TO CHARACTER SET utf8mb3 COLLATE utf8mb3_bin; +ALTER TABLE plugin + MODIFY name varchar(64) COLLATE utf8mb3_general_ci NOT NULL DEFAULT '', + MODIFY dl varchar(128) COLLATE utf8mb3_general_ci NOT NULL DEFAULT '', + CONVERT TO CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci; + + # In MySQL 5.7.6 the Password column is removed. Recreate it to preserve the number # of columns MariaDB expects in the user table. ALTER TABLE user @@ -322,11 +330,6 @@ ALTER TABLE slow_log MODIFY thread_id BIGINT(21) UNSIGNED NOT NULL; SET GLOBAL log_slow_query = @old_log_state; -ALTER TABLE plugin - MODIFY name varchar(64) COLLATE utf8mb3_general_ci NOT NULL DEFAULT '', - MODIFY dl varchar(128) COLLATE utf8mb3_general_ci NOT NULL DEFAULT '', - CONVERT TO CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci; - # # Detect whether we had Create_view_priv # @@ -486,11 +489,11 @@ ALTER TABLE proc MODIFY name char(64) DEFAULT '' NOT NULL, 'SIMULTANEOUS_ASSIGNMENT', 'TIME_ROUND_FRACTIONAL' ) DEFAULT '' NOT NULL, - DEFAULT CHARACTER SET utf8mb3; + DEFAULT CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci; # Correct the character set and collation # Reset some fields after the conversion -ALTER TABLE proc CONVERT TO CHARACTER SET utf8mb3, +ALTER TABLE proc CONVERT TO CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci, MODIFY db char(64) binary DEFAULT '' NOT NULL, MODIFY definer varchar(384) binary DEFAULT '' NOT NULL, MODIFY comment text binary NOT NULL; @@ -576,13 +579,13 @@ UPDATE proc SET Definer = 'mariadb.sys@localhost' WHERE Definer = 'root@localhos SET @hadEventPriv := 0; SELECT @hadEventPriv :=1 FROM user WHERE Event_priv IS NOT NULL; -ALTER TABLE user ADD Event_priv enum('N','Y') character set utf8mb3 DEFAULT 'N' NOT NULL AFTER Create_user_priv; -ALTER TABLE user MODIFY Event_priv enum('N','Y') character set utf8mb3 DEFAULT 'N' NOT NULL AFTER Create_user_priv; +ALTER TABLE user ADD Event_priv enum('N','Y') character set utf8mb3 COLLATE utf8mb3_general_ci DEFAULT 'N' NOT NULL AFTER Create_user_priv; +ALTER TABLE user MODIFY Event_priv enum('N','Y') character set utf8mb3 COLLATE utf8mb3_general_ci DEFAULT 'N' NOT NULL AFTER Create_user_priv; UPDATE user SET Event_priv=Super_priv WHERE @hadEventPriv = 0; -ALTER TABLE db ADD Event_priv enum('N','Y') character set utf8mb3 DEFAULT 'N' NOT NULL; -ALTER TABLE db MODIFY Event_priv enum('N','Y') character set utf8mb3 DEFAULT 'N' NOT NULL; +ALTER TABLE db ADD Event_priv enum('N','Y') character set utf8mb3 COLLATE utf8mb3_general_ci DEFAULT 'N' NOT NULL; +ALTER TABLE db MODIFY Event_priv enum('N','Y') character set utf8mb3 COLLATE utf8mb3_general_ci DEFAULT 'N' NOT NULL; # # EVENT table @@ -628,17 +631,29 @@ ALTER TABLE event MODIFY sql_mode 'SIMULTANEOUS_ASSIGNMENT', 'TIME_ROUND_FRACTIONAL' ) DEFAULT '' NOT NULL AFTER on_completion; -ALTER TABLE event MODIFY name char(64) CHARACTER SET utf8mb3 NOT NULL default ''; +ALTER TABLE event MODIFY name char(64) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL default ''; ALTER TABLE event MODIFY db CHAR(64) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin NOT NULL DEFAULT ''; + +ALTER TABLE event MODIFY interval_field + enum('YEAR','QUARTER','MONTH','DAY','HOUR', + 'MINUTE','WEEK','SECOND','MICROSECOND', + 'YEAR_MONTH','DAY_HOUR','DAY_MINUTE', + 'DAY_SECOND','HOUR_MINUTE','HOUR_SECOND', + 'MINUTE_SECOND','DAY_MICROSECOND','HOUR_MICROSECOND', + 'MINUTE_MICROSECOND','SECOND_MICROSECOND' + ) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL; + ALTER TABLE event MODIFY comment CHAR(64) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin NOT NULL DEFAULT ''; +ALTER TABLE event MODIFY on_completion enum('DROP','PRESERVE') + CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'DROP'; ALTER TABLE event ADD COLUMN originator INT UNSIGNED NOT NULL AFTER comment; ALTER TABLE event MODIFY COLUMN originator INT UNSIGNED NOT NULL; ALTER TABLE event MODIFY COLUMN status ENUM('ENABLED','DISABLED','SLAVESIDE_DISABLED') NOT NULL default 'ENABLED'; -ALTER TABLE event ADD COLUMN time_zone char(64) CHARACTER SET latin1 +ALTER TABLE event ADD COLUMN time_zone char(64) CHARACTER SET latin1 COLLATE latin1_swedish_ci NOT NULL DEFAULT 'SYSTEM' AFTER originator; ALTER TABLE event ADD character_set_client diff --git a/scripts/sys_schema/before_setup.sql b/scripts/sys_schema/before_setup.sql index c0634d69e5c..386125e31e6 100644 --- a/scripts/sys_schema/before_setup.sql +++ b/scripts/sys_schema/before_setup.sql @@ -13,10 +13,10 @@ -- along with this program; if not, write to the Free Software -- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -SET NAMES utf8; +SET NAMES utf8 COLLATE utf8_general_ci; SET @sql_log_bin = @@sql_log_bin; SET sql_log_bin = 0; -CREATE DATABASE IF NOT EXISTS sys DEFAULT CHARACTER SET utf8; +CREATE DATABASE IF NOT EXISTS sys DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci; USE sys; diff --git a/scripts/sys_schema/procedures/diagnostics.sql b/scripts/sys_schema/procedures/diagnostics.sql index 2d2f4664a2d..ddb033b5f6d 100644 --- a/scripts/sys_schema/procedures/diagnostics.sql +++ b/scripts/sys_schema/procedures/diagnostics.sql @@ -110,9 +110,9 @@ CREATE DEFINER='mariadb.sys'@'localhost' PROCEDURE diagnostics ( READS SQL DATA BEGIN DECLARE v_start, v_runtime, v_iter_start, v_sleep DECIMAL(20,2) DEFAULT 0.0; - DECLARE v_has_innodb, v_has_ndb, v_has_ps, v_has_replication, v_has_ps_replication VARCHAR(8) CHARSET utf8 DEFAULT 'NO'; + DECLARE v_has_innodb, v_has_ndb, v_has_ps, v_has_replication, v_has_ps_replication VARCHAR(8) CHARSET utf8 COLLATE utf8_general_ci DEFAULT 'NO'; DECLARE v_this_thread_enabled, v_has_ps_vars, v_has_metrics ENUM('YES', 'NO'); - DECLARE v_table_name, v_banner VARCHAR(64) CHARSET utf8; + DECLARE v_table_name, v_banner VARCHAR(64) CHARSET utf8 COLLATE utf8_general_ci; DECLARE v_sql_status_summary_select, v_sql_status_summary_delta, v_sql_status_summary_from, v_no_delta_names TEXT; DECLARE v_output_time, v_output_time_prev DECIMAL(20,3) UNSIGNED; DECLARE v_output_count, v_count, v_old_group_concat_max_len INT UNSIGNED DEFAULT 0; @@ -688,7 +688,7 @@ BEGIN Type VARCHAR(100) NOT NULL, Enabled ENUM(''YES'', ''NO'', ''PARTIAL'') NOT NULL, PRIMARY KEY (Type, Variable_name) -) ENGINE = InnoDB DEFAULT CHARSET=utf8')); +) ENGINE = InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_general_ci')); IF (v_has_metrics) THEN SET @sys.diagnostics.sql = CONCAT( diff --git a/sql/item_jsonfunc.cc b/sql/item_jsonfunc.cc index ed07ad4ab26..8579c533c4e 100644 --- a/sql/item_jsonfunc.cc +++ b/sql/item_jsonfunc.cc @@ -865,7 +865,7 @@ String *Item_func_json_quote::val_str(String *str) bool Item_func_json_unquote::fix_length_and_dec(THD *thd) { collation.set(&my_charset_utf8mb3_general_ci, - DERIVATION_COERCIBLE, MY_REPERTOIRE_ASCII); + DERIVATION_CAST, MY_REPERTOIRE_ASCII); max_length= args[0]->max_char_length() * collation.collation->mbmaxlen; set_maybe_null(); return FALSE; diff --git a/sql/item_strfunc.h b/sql/item_strfunc.h index 490e6b7c2ad..6392a4c99d0 100644 --- a/sql/item_strfunc.h +++ b/sql/item_strfunc.h @@ -2016,7 +2016,7 @@ public: Item_func_expr_str_metadata(THD *thd, Item *a): Item_str_func(thd, a) { } bool fix_length_and_dec(THD *thd) override { - collation.set(system_charset_info_for_i_s); + collation.set(system_charset_info_for_i_s, DERIVATION_SYSCONST); max_length= 64 * collation.collation->mbmaxlen; // should be enough base_flags&= ~item_base_t::MAYBE_NULL; return FALSE; diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 919c9fae4c2..24c8bf44645 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -352,7 +352,10 @@ char *enforced_storage_engine=NULL; char *gtid_pos_auto_engines; plugin_ref *opt_gtid_pos_auto_plugins; static char compiled_default_collation_name[]= MYSQL_DEFAULT_COLLATION_NAME; -static const char *character_set_collations_str= ""; +static const char *character_set_collations_str= + "utf8mb3=uca1400_ai_ci,utf8mb4=uca1400_ai_ci,ucs2=uca1400_ai_ci," + "utf16=uca1400_ai_ci,utf32=uca1400_ai_ci"; + Thread_cache thread_cache; static bool binlog_format_used= false; LEX_STRING opt_init_connect, opt_init_slave; diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_add_column_after.result b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_add_column_after.result index ecfd91bdf5b..7cd62bafacb 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_add_column_after.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_add_column_after.result @@ -9,7 +9,7 @@ diaries CREATE TABLE `diaries` ( `id` int(11) NOT NULL AUTO_INCREMENT, `body` varchar(140) DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci ALTER TABLE diaries ADD title VARCHAR(40) AFTER id; SHOW CREATE TABLE diaries; Table Create Table @@ -18,7 +18,7 @@ diaries CREATE TABLE `diaries` ( `title` varchar(40) DEFAULT NULL, `body` varchar(140) DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci INSERT INTO diaries (title, body) values ("groonga (1)", "starting groonga."); SELECT * FROM diaries; id title body diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_add_column_first.result b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_add_column_first.result index 404955753f8..1b335726164 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_add_column_first.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_add_column_first.result @@ -9,7 +9,7 @@ diaries CREATE TABLE `diaries` ( `id` int(11) NOT NULL AUTO_INCREMENT, `body` varchar(140) DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci ALTER TABLE diaries ADD title VARCHAR(40) FIRST; SHOW CREATE TABLE diaries; Table Create Table @@ -18,7 +18,7 @@ diaries CREATE TABLE `diaries` ( `id` int(11) NOT NULL AUTO_INCREMENT, `body` varchar(140) DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci INSERT INTO diaries (title, body) values ("groonga (1)", "starting groonga."); SELECT * FROM diaries; title id body diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_add_column_flags_parameter.result b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_add_column_flags_parameter.result index 3580dc1bf56..e90ca09c301 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_add_column_flags_parameter.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_add_column_flags_parameter.result @@ -8,7 +8,7 @@ tags CREATE TABLE `tags` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, `name` varchar(64) DEFAULT NULL `FLAGS`='COLUMN_VECTOR', PRIMARY KEY (`id`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci SELECT mroonga_command("dump --dump_plugins no"); mroonga_command("dump --dump_plugins no") table_create mroonga_operations TABLE_NO_KEY diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_add_column_groonga_type_parameter.result b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_add_column_groonga_type_parameter.result index 63e34b98c44..99932802e45 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_add_column_groonga_type_parameter.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_add_column_groonga_type_parameter.result @@ -11,7 +11,7 @@ bugs CREATE TABLE `bugs` ( `id` int(10) unsigned NOT NULL, `name` varchar(64) DEFAULT NULL `GROONGA_TYPE`='tags', PRIMARY KEY (`id`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci SELECT mroonga_command("dump --dump_plugins no"); mroonga_command("dump --dump_plugins no") table_create bugs TABLE_PAT_KEY UInt32 diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_add_column_multibyte_utf8.result b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_add_column_multibyte_utf8.result index 70c9ea0c546..1ea357a0010 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_add_column_multibyte_utf8.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_add_column_multibyte_utf8.result @@ -2,7 +2,7 @@ DROP TABLE IF EXISTS users; SET NAMES utf8; CREATE TABLE users ( id int PRIMARY KEY -) DEFAULT CHARSET=utf8; +) DEFAULT CHARSET=utf8 COLLATE utf8_general_ci; ALTER TABLE users ADD COLUMN 名前 text, ADD FULLTEXT INDEX (名前); diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_add_column_multiple.result b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_add_column_multiple.result index 3d89aa1ebea..7216a2976d1 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_add_column_multiple.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_add_column_multiple.result @@ -9,7 +9,7 @@ diaries CREATE TABLE `diaries` ( `id` int(11) NOT NULL AUTO_INCREMENT, `title` varchar(40) DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci INSERT INTO diaries (title) VALUES ("survey"); SELECT * FROM diaries; id title @@ -40,5 +40,5 @@ diaries CREATE TABLE `diaries` ( `title` varchar(40) DEFAULT NULL, `created_at` datetime DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=Mroonga AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=Mroonga AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci DROP TABLE diaries; diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_add_column_plain.result b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_add_column_plain.result index a3762372f89..0d8c0e80791 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_add_column_plain.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_add_column_plain.result @@ -9,7 +9,7 @@ diaries CREATE TABLE `diaries` ( `id` int(11) NOT NULL AUTO_INCREMENT, `title` varchar(40) DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci INSERT INTO diaries (title) VALUES ("survey"); SELECT * FROM diaries; id title @@ -33,5 +33,5 @@ diaries CREATE TABLE `diaries` ( `title` varchar(40) DEFAULT NULL, `body` varchar(140) DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=Mroonga AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=Mroonga AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci DROP TABLE diaries; diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_add_index_unique_duplicated.result b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_add_index_unique_duplicated.result index 3938c6fc7c4..bb550c1b0db 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_add_index_unique_duplicated.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_add_index_unique_duplicated.result @@ -9,7 +9,7 @@ SHOW CREATE TABLE ids; Table Create Table ids CREATE TABLE `ids` ( `id` int(11) DEFAULT NULL -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci SELECT * FROM ids; id 1 diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_add_index_unique_multiple_column_duplicated.result b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_add_index_unique_multiple_column_duplicated.result index cf06223a648..3c5ecdf6392 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_add_index_unique_multiple_column_duplicated.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_add_index_unique_multiple_column_duplicated.result @@ -11,7 +11,7 @@ Table Create Table ids CREATE TABLE `ids` ( `id1` int(11) DEFAULT NULL, `id2` int(11) DEFAULT NULL -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci SELECT * FROM ids; id1 id2 1 2 diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_add_key_multiple_column_with_data.result b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_add_key_multiple_column_with_data.result index 930f1f48c4c..b9a523a9e52 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_add_key_multiple_column_with_data.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_add_key_multiple_column_with_data.result @@ -12,7 +12,7 @@ scores CREATE TABLE `scores` ( `name` char(30) NOT NULL, `score` int(11) NOT NULL, PRIMARY KEY (`id`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci INSERT INTO scores (name, score) VALUES("Taro Yamada", 29); INSERT INTO scores (name, score) VALUES("Taro Yamada", -12); INSERT INTO scores (name, score) VALUES("Jiro Yamada", 27); diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_add_primary_key.result b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_add_primary_key.result index adca183f410..acf581ff78c 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_add_primary_key.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_add_primary_key.result @@ -10,7 +10,7 @@ Table Create Table ids CREATE TABLE `ids` ( `id` int(11) NOT NULL, PRIMARY KEY (`id`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci SELECT * FROM ids WHERE id = 2; id 2 diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_change_column_comment_not_for_mroonga.result b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_change_column_comment_not_for_mroonga.result index aa90e9ff2eb..cccbc21df0a 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_change_column_comment_not_for_mroonga.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_change_column_comment_not_for_mroonga.result @@ -13,5 +13,5 @@ bugs CREATE TABLE `bugs` ( `id` int(10) unsigned NOT NULL, `tag` varchar(64) DEFAULT NULL COMMENT 'It must consist of only alphabet and number.', PRIMARY KEY (`id`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci DROP TABLE bugs; diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_change_column_have_index.result b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_change_column_have_index.result index 7be787aa969..9c46c47eca1 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_change_column_have_index.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_change_column_have_index.result @@ -12,5 +12,5 @@ bugs CREATE TABLE `bugs` ( `title` varchar(64) DEFAULT NULL, PRIMARY KEY (`id`), FULLTEXT KEY `title` (`title`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci DROP TABLE bugs; diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_change_column_rename_after.result b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_change_column_rename_after.result index c58ee2b75bd..9122b2e2182 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_change_column_rename_after.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_change_column_rename_after.result @@ -11,7 +11,7 @@ diaries CREATE TABLE `diaries` ( `title` varchar(40) DEFAULT NULL, `body` varchar(140) DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci ALTER TABLE diaries CHANGE body description VARCHAR(140) AFTER id; SHOW CREATE TABLE diaries; Table Create Table @@ -20,7 +20,7 @@ diaries CREATE TABLE `diaries` ( `description` varchar(140) DEFAULT NULL, `title` varchar(40) DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci INSERT INTO diaries (title, description) values ("groonga (1)", "starting groonga."); SELECT * FROM diaries; id description title diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_change_column_rename_first.result b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_change_column_rename_first.result index 68885fa943b..e3f69f4c3c6 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_change_column_rename_first.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_change_column_rename_first.result @@ -11,7 +11,7 @@ diaries CREATE TABLE `diaries` ( `title` varchar(40) DEFAULT NULL, `body` varchar(140) DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci ALTER TABLE diaries CHANGE body description VARCHAR(140) FIRST; SHOW CREATE TABLE diaries; Table Create Table @@ -20,7 +20,7 @@ diaries CREATE TABLE `diaries` ( `id` int(11) NOT NULL AUTO_INCREMENT, `title` varchar(40) DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci INSERT INTO diaries (title, description) values ("groonga (1)", "starting groonga."); SELECT * FROM diaries; description id title diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_change_column_rename_multiple.result b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_change_column_rename_multiple.result index af5a2c3ad3c..a1919fcac84 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_change_column_rename_multiple.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_change_column_rename_multiple.result @@ -11,7 +11,7 @@ diaries CREATE TABLE `diaries` ( `title` varchar(40) DEFAULT NULL, `body` varchar(140) DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci ALTER TABLE diaries CHANGE body description VARCHAR(140) FIRST, CHANGE title subject VARCHAR(40) AFTER internal_id, @@ -23,7 +23,7 @@ diaries CREATE TABLE `diaries` ( `internal_id` int(11) NOT NULL AUTO_INCREMENT, `subject` varchar(40) DEFAULT NULL, PRIMARY KEY (`internal_id`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci INSERT IGNORE INTO diaries (subject, description) VALUES ("groonga (1)", "starting groonga."); SELECT * FROM diaries; diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_change_column_rename_no_order.result b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_change_column_rename_no_order.result index 4318f68696f..36c38b74c8c 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_change_column_rename_no_order.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_change_column_rename_no_order.result @@ -11,7 +11,7 @@ diaries CREATE TABLE `diaries` ( `title` varchar(40) DEFAULT NULL, `body` varchar(140) DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci ALTER TABLE diaries CHANGE body description VARCHAR(140); SHOW CREATE TABLE diaries; Table Create Table @@ -20,7 +20,7 @@ diaries CREATE TABLE `diaries` ( `title` varchar(40) DEFAULT NULL, `description` varchar(140) DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci INSERT INTO diaries (title, description) values ("groonga (1)", "starting groonga."); SELECT * FROM diaries; id title description diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_change_engine_decimal.result b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_change_engine_decimal.result index a66f0cac998..e9a2d8a7193 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_change_engine_decimal.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_change_engine_decimal.result @@ -9,7 +9,7 @@ diaries CREATE TABLE `diaries` ( `id` int(11) NOT NULL AUTO_INCREMENT, `temperature` decimal(6,3) DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci INSERT INTO diaries (temperature) VALUES (21.281); SELECT * FROM diaries; id temperature @@ -31,5 +31,5 @@ diaries CREATE TABLE `diaries` ( `id` int(11) NOT NULL AUTO_INCREMENT, `temperature` decimal(6,3) DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=Mroonga AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=Mroonga AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci DROP TABLE diaries; diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_drop_column_multiple.result b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_drop_column_multiple.result index ea62084db0b..a814146bffa 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_drop_column_multiple.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_drop_column_multiple.result @@ -11,7 +11,7 @@ diaries CREATE TABLE `diaries` ( `title` varchar(40) DEFAULT NULL, `body` varchar(140) DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci INSERT INTO diaries (title, body) VALUES ("survey", "will start groonga!"); SELECT * FROM diaries; id title body @@ -24,7 +24,7 @@ Table Create Table diaries CREATE TABLE `diaries` ( `id` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`id`) -) ENGINE=Mroonga AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=Mroonga AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci SELECT * FROM diaries; id 1 diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_drop_column_one.result b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_drop_column_one.result index 8b06caa0c36..dbb6c9ee7d3 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_drop_column_one.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_drop_column_one.result @@ -11,7 +11,7 @@ diaries CREATE TABLE `diaries` ( `title` varchar(40) DEFAULT NULL, `body` varchar(140) DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci INSERT INTO diaries (title, body) VALUES ("survey", "will start groonga!"); SELECT * FROM diaries; id title body @@ -23,7 +23,7 @@ diaries CREATE TABLE `diaries` ( `id` int(11) NOT NULL AUTO_INCREMENT, `title` varchar(40) DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=Mroonga AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=Mroonga AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci SELECT * FROM diaries; id title 1 survey diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_drop_key_multiple_column_with_data.result b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_drop_key_multiple_column_with_data.result index 21aca41a569..ab9bd5a9af4 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_drop_key_multiple_column_with_data.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_drop_key_multiple_column_with_data.result @@ -14,7 +14,7 @@ scores CREATE TABLE `scores` ( `score` int(11) NOT NULL, PRIMARY KEY (`id`), KEY `property` (`name`,`score`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci INSERT INTO scores (name, score) VALUES("Taro Yamada", 29); INSERT INTO scores (name, score) VALUES("Taro Yamada", -12); INSERT INTO scores (name, score) VALUES("Jiro Yamada", 27); diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_drop_primary_key.result b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_drop_primary_key.result index 95914d303ca..a25ca0d9665 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_drop_primary_key.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_drop_primary_key.result @@ -9,7 +9,7 @@ SHOW CREATE TABLE ids; Table Create Table ids CREATE TABLE `ids` ( `id` int(11) NOT NULL -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci SELECT * FROM ids WHERE id = 2; id 2 diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_fulltext_add_no_primary_key.result b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_fulltext_add_no_primary_key.result index ac0600e0368..e05b1c1cf17 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_fulltext_add_no_primary_key.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_fulltext_add_no_primary_key.result @@ -11,7 +11,7 @@ Table Create Table memos CREATE TABLE `memos` ( `content` varchar(32) DEFAULT NULL, FULLTEXT KEY `content_index` (`content`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci SELECT * FROM memos WHERE MATCH(content) AGAINST("groonga"); content Starting Groonga... diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_fulltext_add_table.result b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_fulltext_add_table.result index 705d2f70126..411dee66353 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_fulltext_add_table.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_fulltext_add_table.result @@ -2,11 +2,11 @@ DROP TABLE IF EXISTS tags; DROP TABLE IF EXISTS bugs; CREATE TABLE tags ( name VARCHAR(64) PRIMARY KEY -) DEFAULT CHARSET=utf8 COMMENT='default_tokenizer "TokenDelimit"'; +) DEFAULT CHARSET=utf8 COLLATE utf8_general_ci COMMENT='default_tokenizer "TokenDelimit"'; CREATE TABLE bugs ( id INT UNSIGNED PRIMARY KEY, tags VARCHAR(40) COMMENT 'type "tags"' -) DEFAULT CHARSET=utf8; +) DEFAULT CHARSET=utf8 COLLATE utf8_general_ci; INSERT INTO tags (name) VALUES ("Groonga"); INSERT INTO bugs (id, tags) VALUES (1, "Groonga Mroonga"); SELECT * FROM bugs; diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_fulltext_drop_table.result b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_fulltext_drop_table.result index 2d5e3d55ca7..ef4475b3f60 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_fulltext_drop_table.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_fulltext_drop_table.result @@ -2,12 +2,12 @@ DROP TABLE IF EXISTS tags; DROP TABLE IF EXISTS bugs; CREATE TABLE tags ( name VARCHAR(64) PRIMARY KEY -) DEFAULT CHARSET=utf8 COMMENT='default_tokenizer "TokenDelimit"'; +) DEFAULT CHARSET=utf8 COLLATE utf8_general_ci COMMENT='default_tokenizer "TokenDelimit"'; CREATE TABLE bugs ( id INT UNSIGNED PRIMARY KEY, tags VARCHAR(40) COMMENT 'type "tags"', FULLTEXT INDEX bugs_tags_index (tags) COMMENT 'table "tags"' -) DEFAULT CHARSET=utf8; +) DEFAULT CHARSET=utf8 COLLATE utf8_general_ci; INSERT INTO tags (name) VALUES ("Groonga"); INSERT INTO bugs (id, tags) VALUES (1, "Groonga Mroonga"); ALTER TABLE bugs DROP INDEX bugs_tags_index; diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_modify_column_after.result b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_modify_column_after.result index 6ef97d89f48..a1ec5f9ded8 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_modify_column_after.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_modify_column_after.result @@ -11,7 +11,7 @@ diaries CREATE TABLE `diaries` ( `title` varchar(40) DEFAULT NULL, `body` varchar(140) DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci INSERT INTO diaries (title, body) values ("groonga (1)", "starting groonga."); SELECT * FROM diaries; id title body @@ -24,7 +24,7 @@ diaries CREATE TABLE `diaries` ( `body` varchar(140) DEFAULT NULL, `title` varchar(40) DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=Mroonga AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=Mroonga AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci INSERT INTO diaries (title, body) values ("groonga (2)", "started groonga."); SELECT * FROM diaries; id body title diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_modify_column_first.result b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_modify_column_first.result index b5d7df8d6ea..abfd6fc8ae5 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_modify_column_first.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_modify_column_first.result @@ -11,7 +11,7 @@ diaries CREATE TABLE `diaries` ( `title` varchar(40) DEFAULT NULL, `body` varchar(140) DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci INSERT INTO diaries (title, body) values ("groonga (1)", "starting groonga."); SELECT * FROM diaries; id title body @@ -24,7 +24,7 @@ diaries CREATE TABLE `diaries` ( `id` int(11) NOT NULL AUTO_INCREMENT, `title` varchar(40) DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=Mroonga AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=Mroonga AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci INSERT INTO diaries (title, body) values ("groonga (2)", "started groonga."); SELECT * FROM diaries; body id title diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_modify_column_no_order.result b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_modify_column_no_order.result index 884ee68bdac..ce2e702bc2a 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_modify_column_no_order.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_modify_column_no_order.result @@ -11,7 +11,7 @@ diaries CREATE TABLE `diaries` ( `title` varchar(40) DEFAULT NULL, `body` varchar(140) DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci INSERT INTO diaries (title, body) values ("groonga (1)", "starting groonga."); SELECT * FROM diaries; id title body @@ -24,7 +24,7 @@ diaries CREATE TABLE `diaries` ( `title` varchar(100) DEFAULT NULL, `body` varchar(140) DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=Mroonga AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=Mroonga AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci INSERT INTO diaries (title, body) values ("groonga (2)", "started groonga."); SELECT * FROM diaries; id title body diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/column_comment_index_not_for_mroonga.result b/storage/mroonga/mysql-test/mroonga/storage/r/column_comment_index_not_for_mroonga.result index e09f4e8378c..550e6d91419 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/column_comment_index_not_for_mroonga.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/column_comment_index_not_for_mroonga.result @@ -8,5 +8,5 @@ Table Create Table bugs CREATE TABLE `bugs` ( `id` int(10) unsigned DEFAULT NULL, KEY `id` (`id`) COMMENT 'ID search is required.' -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci DROP TABLE bugs; diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/column_comment_normal_not_for_mroonga.result b/storage/mroonga/mysql-test/mroonga/storage/r/column_comment_normal_not_for_mroonga.result index 01c4f64f439..ec48adcb7bc 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/column_comment_normal_not_for_mroonga.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/column_comment_normal_not_for_mroonga.result @@ -9,5 +9,5 @@ bugs CREATE TABLE `bugs` ( `id` int(10) unsigned NOT NULL, `tag` varchar(64) DEFAULT NULL COMMENT 'It must consist of only alphabet and number.', PRIMARY KEY (`id`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci DROP TABLE bugs; diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/column_date_with_index.result b/storage/mroonga/mysql-test/mroonga/storage/r/column_date_with_index.result index 57d2c41742b..a7cdb258459 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/column_date_with_index.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/column_date_with_index.result @@ -13,7 +13,7 @@ diaries CREATE TABLE `diaries` ( `created_at` date DEFAULT NULL, PRIMARY KEY (`id`), KEY `created_at` (`created_at`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci INSERT INTO diaries (title, created_at) VALUES ("clear day", "2012-01-29"); INSERT INTO diaries (title, created_at) VALUES ("rainy day", "2012-01-30"); INSERT INTO diaries (title, created_at) VALUES ("cloudy day", "2012-01-31"); diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/column_date_without_index.result b/storage/mroonga/mysql-test/mroonga/storage/r/column_date_without_index.result index 26af0dd9e82..504b1b22090 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/column_date_without_index.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/column_date_without_index.result @@ -11,7 +11,7 @@ diaries CREATE TABLE `diaries` ( `title` varchar(40) DEFAULT NULL, `created_at` date DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci INSERT INTO diaries (title, created_at) VALUES ("clear day", "2012-01-29"); INSERT INTO diaries (title, created_at) VALUES ("rainy day", "2012-01-30"); INSERT INTO diaries (title, created_at) VALUES ("cloudy day", "2012-01-31"); diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/column_enum_less_with_index.result b/storage/mroonga/mysql-test/mroonga/storage/r/column_enum_less_with_index.result index abec4ecafba..6396e0fac20 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/column_enum_less_with_index.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/column_enum_less_with_index.result @@ -10,7 +10,7 @@ items CREATE TABLE `items` ( `name` varchar(255) DEFAULT NULL, `size` enum('small','medium','large') DEFAULT NULL, KEY `size` (`size`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci INSERT INTO items VALUES ("t-shart for child", "small"); INSERT INTO items VALUES ("leadies' coat", "medium"); INSERT INTO items VALUES ("parka", "large"); diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/column_enum_many_with_index.result b/storage/mroonga/mysql-test/mroonga/storage/r/column_enum_many_with_index.result index d116ff9ee36..b390546d544 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/column_enum_many_with_index.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/column_enum_many_with_index.result @@ -265,7 +265,7 @@ items CREATE TABLE `items` ( `name` varchar(255) DEFAULT NULL, `size` enum('size1','size2','size3','size4','size5','size6','size7','size8','size9','size10','size11','size12','size13','size14','size15','size16','size17','size18','size19','size20','size21','size22','size23','size24','size25','size26','size27','size28','size29','size30','size31','size32','size33','size34','size35','size36','size37','size38','size39','size40','size41','size42','size43','size44','size45','size46','size47','size48','size49','size50','size51','size52','size53','size54','size55','size56','size57','size58','size59','size60','size61','size62','size63','size64','size65','size66','size67','size68','size69','size70','size71','size72','size73','size74','size75','size76','size77','size78','size79','size80','size81','size82','size83','size84','size85','size86','size87','size88','size89','size90','size91','size92','size93','size94','size95','size96','size97','size98','size99','size100','size101','size102','size103','size104','size105','size106','size107','size108','size109','size110','size111','size112','size113','size114','size115','size116','size117','size118','size119','size120','size121','size122','size123','size124','size125','size126','size127','size128','size129','size130','size131','size132','size133','size134','size135','size136','size137','size138','size139','size140','size141','size142','size143','size144','size145','size146','size147','size148','size149','size150','size151','size152','size153','size154','size155','size156','size157','size158','size159','size160','size161','size162','size163','size164','size165','size166','size167','size168','size169','size170','size171','size172','size173','size174','size175','size176','size177','size178','size179','size180','size181','size182','size183','size184','size185','size186','size187','size188','size189','size190','size191','size192','size193','size194','size195','size196','size197','size198','size199','size200','size201','size202','size203','size204','size205','size206','size207','size208','size209','size210','size211','size212','size213','size214','size215','size216','size217','size218','size219','size220','size221','size222','size223','size224','size225','size226','size227','size228','size229','size230','size231','size232','size233','size234','size235','size236','size237','size238','size239','size240','size241','size242','size243','size244','size245','size246','size247','size248','size249','size250','size251','size252','size253','size254','size255','size256') DEFAULT NULL, KEY `size` (`size`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci INSERT INTO items VALUES ("t-shart for child", "size1"); INSERT INTO items VALUES ("leadies' coat", "size1"); INSERT INTO items VALUES ("parka", "size256"); diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/column_groonga_index_fulltext_other_table.result b/storage/mroonga/mysql-test/mroonga/storage/r/column_groonga_index_fulltext_other_table.result index 767fe491e99..a2628585b7e 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/column_groonga_index_fulltext_other_table.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/column_groonga_index_fulltext_other_table.result @@ -1,12 +1,12 @@ CREATE TABLE terms ( name VARCHAR(64) PRIMARY KEY -) DEFAULT CHARSET=utf8 +) DEFAULT CHARSET=utf8 COLLATE utf8_general_ci COMMENT='default_tokenizer "TokenBigram"'; CREATE TABLE bugs ( id INT UNSIGNED PRIMARY KEY, title TEXT, FULLTEXT INDEX (title) COMMENT 'table "terms"' -) DEFAULT CHARSET=utf8; +) DEFAULT CHARSET=utf8 COLLATE utf8_general_ci; INSERT INTO bugs (id, title) VALUES (1, "Mroonga can't build with MySQL X.Y.Z"); SELECT * FROM terms ORDER BY name; name diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/column_groonga_scalar_with_not_for_mroonga_comment.result b/storage/mroonga/mysql-test/mroonga/storage/r/column_groonga_scalar_with_not_for_mroonga_comment.result index f94f568460f..dafa3fcb7d2 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/column_groonga_scalar_with_not_for_mroonga_comment.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/column_groonga_scalar_with_not_for_mroonga_comment.result @@ -9,7 +9,7 @@ tag TEXT COMMENT 'It references to tags.name, type "tags"' ) DEFAULT CHARSET=utf8; SHOW FULL COLUMNS FROM bugs LIKE 'tag'; Field Type Collation Null Key Default Extra Privileges Comment -tag text utf8mb3_general_ci YES NULL select,insert,update,references It references to tags.name, type "tags" +tag text utf8mb3_uca1400_ai_ci YES NULL select,insert,update,references It references to tags.name, type "tags" INSERT INTO bugs (id, tag) VALUES (1, "Linux"); INSERT INTO bugs (id, tag) VALUES (2, "MySQL"); INSERT INTO bugs (id, tag) VALUES (3, "groonga"); diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/column_groonga_vector_reference.result b/storage/mroonga/mysql-test/mroonga/storage/r/column_groonga_vector_reference.result index 1eceec2b45f..1d3b12d8750 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/column_groonga_vector_reference.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/column_groonga_vector_reference.result @@ -14,7 +14,7 @@ bugs CREATE TABLE `bugs` ( `id` int(10) unsigned NOT NULL, `tags` varchar(128) DEFAULT '' COMMENT 'flags "COLUMN_VECTOR", type "tags"', PRIMARY KEY (`id`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci INSERT INTO bugs (id, tags) VALUES (1, "Linux MySQL groonga"); SELECT * FROM bugs; id tags diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/column_multibyte_utf8.result b/storage/mroonga/mysql-test/mroonga/storage/r/column_multibyte_utf8.result index 6f63b5b3856..2d6e179303f 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/column_multibyte_utf8.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/column_multibyte_utf8.result @@ -3,7 +3,7 @@ SET NAMES utf8; CREATE TABLE users ( 名前 text, FULLTEXT INDEX (名前) -) DEFAULT CHARSET=utf8; +) DEFAULT CHARSET=utf8 COLLATE utf8_general_ci; INSERT INTO users VALUES ("やまだ"); INSERT INTO users VALUES ("たなか"); INSERT INTO users VALUES ("すずき"); diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/column_set_16_with_index.result b/storage/mroonga/mysql-test/mroonga/storage/r/column_set_16_with_index.result index 55a12a2d2fd..b9dd3c7cc1d 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/column_set_16_with_index.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/column_set_16_with_index.result @@ -25,7 +25,7 @@ items CREATE TABLE `items` ( `name` varchar(255) DEFAULT NULL, `colors` set('black','dim gray','dark gray','gray','light gray','gainsboro','white smoke','white','red','orange red','dark orange','orange','gold','yellow','chartreuse','lawn green') DEFAULT NULL, KEY `colors` (`colors`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci INSERT INTO items VALUES ("t-shart", "black,gray"); INSERT INTO items VALUES ("hat", "white,dark gray"); INSERT INTO items VALUES ("parka", "chartreuse,orange"); diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/column_set_24_with_index.result b/storage/mroonga/mysql-test/mroonga/storage/r/column_set_24_with_index.result index c485acfebb6..a45aac04e2d 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/column_set_24_with_index.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/column_set_24_with_index.result @@ -33,7 +33,7 @@ items CREATE TABLE `items` ( `name` varchar(255) DEFAULT NULL, `colors` set('black','dim gray','dark gray','gray','light gray','gainsboro','white smoke','white','red','orange red','dark orange','orange','gold','yellow','chartreuse','lawn green','green','spring green','medium spring green','cyan','deep sky blue','blue','medium blue','dark violet') DEFAULT NULL, KEY `colors` (`colors`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci INSERT INTO items VALUES ("t-shart", "black,white"); INSERT INTO items VALUES ("hat", "white,lawn green"); INSERT INTO items VALUES ("parka", "gray,medium blue"); diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/column_set_32_with_index.result b/storage/mroonga/mysql-test/mroonga/storage/r/column_set_32_with_index.result index 7ff86090382..44baed34a76 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/column_set_32_with_index.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/column_set_32_with_index.result @@ -41,7 +41,7 @@ items CREATE TABLE `items` ( `name` varchar(255) DEFAULT NULL, `colors` set('black','dim gray','dark gray','gray','light gray','gainsboro','white smoke','white','red','orange red','dark orange','orange','gold','yellow','chartreuse','lawn green','green','spring green','medium spring green','cyan','deep sky blue','blue','medium blue','dark violet','dark magenta','magenta','dark red','brown','firebrick','indian red','light coral','salmon') DEFAULT NULL, KEY `colors` (`colors`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci INSERT INTO items VALUES ("t-shart", "black,white"); INSERT INTO items VALUES ("hat", "white,dark violet"); INSERT INTO items VALUES ("parka", "green,brown,red"); diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/column_set_64_with_index.result b/storage/mroonga/mysql-test/mroonga/storage/r/column_set_64_with_index.result index 393372ae283..9bd9fa562c1 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/column_set_64_with_index.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/column_set_64_with_index.result @@ -73,7 +73,7 @@ items CREATE TABLE `items` ( `name` varchar(255) DEFAULT NULL, `colors` set('black','dim gray','dark gray','gray','light gray','gainsboro','white smoke','white','red','orange red','dark orange','orange','gold','yellow','chartreuse','lawn green','green','spring green','medium spring green','cyan','deep sky blue','blue','medium blue','dark violet','dark magenta','magenta','dark red','brown','firebrick','indian red','light coral','salmon','light salmon','tomato','coral','dark salmon','rosy brown','sienna','saddle brown','chocolate','peru','sandy brown','burlywood','tan','navajo white','wheat','dark goldenrod','goldenrod','light goldenrod','pale goldenrod','cornsilk','dark khaki','khaki','lemon chiffon','dark olive green','olive drab','yellow green','green yellow','light green','forest green','dark green','lime green','pale green','dark sea green') DEFAULT NULL, KEY `colors` (`colors`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci INSERT INTO items VALUES ("t-shart", "black,white,lawn green,dark violet"); INSERT INTO items VALUES ("hat", "white,dark violet,yellow green"); INSERT INTO items VALUES ("parka", "green,brown,red,lime green"); diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/column_set_8_with_index.result b/storage/mroonga/mysql-test/mroonga/storage/r/column_set_8_with_index.result index cf7aaffdb12..3818ed5a81a 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/column_set_8_with_index.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/column_set_8_with_index.result @@ -17,7 +17,7 @@ items CREATE TABLE `items` ( `name` varchar(255) DEFAULT NULL, `colors` set('black','dim gray','dark gray','gray','light gray','gainsboro','white smoke','white') DEFAULT NULL, KEY `colors` (`colors`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci INSERT INTO items VALUES ("t-shart", "black,gray"); INSERT INTO items VALUES ("hat", "dim gray,dark gray"); INSERT INTO items VALUES ("parka", "white smoke,light gray"); diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/create_table_column_groonga_type_parameter.result b/storage/mroonga/mysql-test/mroonga/storage/r/create_table_column_groonga_type_parameter.result index fca13805e7e..33f54d7086d 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/create_table_column_groonga_type_parameter.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/create_table_column_groonga_type_parameter.result @@ -11,7 +11,7 @@ bugs CREATE TABLE `bugs` ( `id` int(10) unsigned NOT NULL, `tag` varchar(64) DEFAULT NULL `GROONGA_TYPE`='tags', PRIMARY KEY (`id`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci SELECT mroonga_command("dump --dump_plugins no"); mroonga_command("dump --dump_plugins no") table_create bugs TABLE_PAT_KEY UInt32 diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/create_table_comment_normal.result b/storage/mroonga/mysql-test/mroonga/storage/r/create_table_comment_normal.result index b9bcb1c997e..f62e29d6e11 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/create_table_comment_normal.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/create_table_comment_normal.result @@ -7,5 +7,5 @@ SHOW CREATE TABLE bugs; Table Create Table bugs CREATE TABLE `bugs` ( `id` int(10) unsigned DEFAULT NULL -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci COMMENT='Free style normal comment' +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci COMMENT='Free style normal comment' DROP TABLE bugs; diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/create_table_index_flags_parameter.result b/storage/mroonga/mysql-test/mroonga/storage/r/create_table_index_flags_parameter.result index 1d8a6e1a131..57a3fa3c3f0 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/create_table_index_flags_parameter.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/create_table_index_flags_parameter.result @@ -8,7 +8,7 @@ Table Create Table memos CREATE TABLE `memos` ( `content` varchar(64) NOT NULL, FULLTEXT KEY `content` (`content`) `FLAGS`='WITH_POSITION|WITH_WEIGHT' -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci SELECT mroonga_command("dump --dump_plugins no --dump_schema no"); mroonga_command("dump --dump_plugins no --dump_schema no") column_create memos#content index COLUMN_INDEX|WITH_WEIGHT|WITH_POSITION memos content diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/create_table_index_normalizer_parameter.result b/storage/mroonga/mysql-test/mroonga/storage/r/create_table_index_normalizer_parameter.result index 2fac27a0d31..8f2a9a39db1 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/create_table_index_normalizer_parameter.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/create_table_index_normalizer_parameter.result @@ -12,7 +12,7 @@ memos CREATE TABLE `memos` ( `content` text NOT NULL, PRIMARY KEY (`id`), FULLTEXT KEY `content` (`content`) `NORMALIZER`='NormalizerAuto' -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci INSERT INTO memos VALUES (1, "1日の消費㌍は約2000㌔㌍"); SELECT * FROM memos WHERE MATCH (content) AGAINST ("+カロリー" IN BOOLEAN MODE); diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/function_command_special-database-name.result b/storage/mroonga/mysql-test/mroonga/storage/r/function_command_special-database-name.result index e588408e9e2..dff3ad57662 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/function_command_special-database-name.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/function_command_special-database-name.result @@ -5,7 +5,7 @@ SET NAMES UTF8; CREATE TABLE diaries ( title TEXT, FULLTEXT KEY (title) -) DEFAULT CHARSET=utf8; +) DEFAULT CHARSET=utf8 COLLATE utf8_general_ci; SELECT mroonga_command('dump --dump_plugins no'); mroonga_command('dump --dump_plugins no') table_create diaries TABLE_NO_KEY diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_delete.result b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_delete.result index ec18eb22e44..b8ff077428c 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_delete.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_delete.result @@ -14,7 +14,7 @@ scores CREATE TABLE `scores` ( `score` int(11) NOT NULL, PRIMARY KEY (`id`), KEY `property` (`name`,`score`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci insert into scores (name, score) values("Taro Yamada", 29); insert into scores (name, score) values("Taro Yamada", -12); insert into scores (name, score) values("Jiro Yamada", 27); diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_nullable_smallint.result b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_nullable_smallint.result index fec0aa47de5..7808f9a2367 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_nullable_smallint.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_nullable_smallint.result @@ -13,7 +13,7 @@ t1 CREATE TABLE `t1` ( `c2` smallint(6) DEFAULT NULL, PRIMARY KEY (`id`), KEY `idx1` (`c1`,`c2`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci INSERT INTO t1 (c1, c2) VALUES (1999, 12), (2000, 11), diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_nullable_unsigned_bigint.result b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_nullable_unsigned_bigint.result index 4a16031b5d1..658ca9c5d41 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_nullable_unsigned_bigint.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_nullable_unsigned_bigint.result @@ -13,7 +13,7 @@ t1 CREATE TABLE `t1` ( `c2` bigint(20) unsigned DEFAULT NULL, PRIMARY KEY (`id`), KEY `idx1` (`c1`,`c2`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci INSERT INTO t1 (c1, c2) VALUES (1999, 12), (2000, 11), diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_nullable_unsigned_int.result b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_nullable_unsigned_int.result index a3ede5e7a3b..87ee74af3f7 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_nullable_unsigned_int.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_nullable_unsigned_int.result @@ -13,7 +13,7 @@ t1 CREATE TABLE `t1` ( `c2` int(10) unsigned DEFAULT NULL, PRIMARY KEY (`id`), KEY `idx1` (`c1`,`c2`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci INSERT INTO t1 (c1, c2) VALUES (1999, 12), (2000, 11), diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_nullable_unsigned_smallint.result b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_nullable_unsigned_smallint.result index aa752b5cdd0..62c6c589deb 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_nullable_unsigned_smallint.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_nullable_unsigned_smallint.result @@ -13,7 +13,7 @@ t1 CREATE TABLE `t1` ( `c2` smallint(5) unsigned DEFAULT NULL, PRIMARY KEY (`id`), KEY `idx1` (`c1`,`c2`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci INSERT INTO t1 (c1, c2) VALUES (1999, 12), (2000, 11), diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_nullable_varchar.result b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_nullable_varchar.result index 8fb207bcdff..d766073de85 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_nullable_varchar.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_nullable_varchar.result @@ -13,7 +13,7 @@ t1 CREATE TABLE `t1` ( `c2` varchar(10) DEFAULT NULL, PRIMARY KEY (`id`), KEY `idx1` (`c1`,`c2`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci INSERT INTO t1 (c1, c2) VALUES ('1999', '12'), ('2000', '11'), diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_order_by_where_equal_asc_asc.result b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_order_by_where_equal_asc_asc.result index 81e11c3d1e2..24740164a0c 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_order_by_where_equal_asc_asc.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_order_by_where_equal_asc_asc.result @@ -15,7 +15,7 @@ items CREATE TABLE `items` ( `score3` int(11) DEFAULT NULL, PRIMARY KEY (`id`), KEY `score1` (`score1`,`score2`,`score3`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci INSERT INTO items (score1, score2, score3) VALUES(1, 10, -100); INSERT INTO items (score1, score2, score3) VALUES(1, 10, 0); INSERT INTO items (score1, score2, score3) VALUES(2, 10, 100); diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_order_by_where_equal_desc_desc.result b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_order_by_where_equal_desc_desc.result index be5285fc9ea..e9ef261bf19 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_order_by_where_equal_desc_desc.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_order_by_where_equal_desc_desc.result @@ -15,7 +15,7 @@ items CREATE TABLE `items` ( `score3` int(11) DEFAULT NULL, PRIMARY KEY (`id`), KEY `score1` (`score1`,`score2`,`score3`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci INSERT INTO items (score1, score2, score3) VALUES(1, 10, -100); INSERT INTO items (score1, score2, score3) VALUES(1, 10, 0); INSERT INTO items (score1, score2, score3) VALUES(2, 10, 100); diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_primary_delete.result b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_primary_delete.result index bbc5e94d4ab..fe82d1e18ea 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_primary_delete.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_primary_delete.result @@ -11,7 +11,7 @@ scores CREATE TABLE `scores` ( `name` char(30) NOT NULL, `score` int(11) NOT NULL, PRIMARY KEY (`name`,`score`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci insert into scores (name, score) values("Taro Yamada", 29); insert into scores (name, score) values("Taro Yamada", -12); insert into scores (name, score) values("Jiro Yamada", 27); diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_primary_select_int.result b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_primary_select_int.result index 7f51a04d9c5..c0e91839042 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_primary_select_int.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_primary_select_int.result @@ -11,7 +11,7 @@ scores CREATE TABLE `scores` ( `name` char(30) NOT NULL, `score` int(11) NOT NULL, PRIMARY KEY (`name`,`score`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci insert into scores (name, score) values("Taro Yamada", 29); insert into scores (name, score) values("Taro Yamada", -12); insert into scores (name, score) values("Jiro Yamada", 27); diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_all_used_greater_than.result b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_all_used_greater_than.result index b44ba312fec..c06dc6133e5 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_all_used_greater_than.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_all_used_greater_than.result @@ -13,7 +13,7 @@ items CREATE TABLE `items` ( `created_at` datetime DEFAULT NULL, PRIMARY KEY (`id`), KEY `score` (`score`,`created_at`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci INSERT INTO items (score, created_at) VALUES(1, "2014-09-10 00:00:00"); INSERT INTO items (score, created_at) VALUES(2, "2014-09-11 00:00:00"); INSERT INTO items (score, created_at) VALUES(2, "2014-09-11 00:00:00"); diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_all_used_greater_than_or_equal.result b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_all_used_greater_than_or_equal.result index e02a82cffc1..ffa837cee51 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_all_used_greater_than_or_equal.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_all_used_greater_than_or_equal.result @@ -13,7 +13,7 @@ items CREATE TABLE `items` ( `created_at` datetime DEFAULT NULL, PRIMARY KEY (`id`), KEY `score` (`score`,`created_at`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci INSERT INTO items (score, created_at) VALUES(1, "2014-09-10 00:00:00"); INSERT INTO items (score, created_at) VALUES(2, "2014-09-11 00:00:00"); INSERT INTO items (score, created_at) VALUES(2, "2014-09-11 00:00:00"); diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_all_used_less_than.result b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_all_used_less_than.result index ae746e722bc..82f5987564b 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_all_used_less_than.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_all_used_less_than.result @@ -13,7 +13,7 @@ items CREATE TABLE `items` ( `created_at` datetime DEFAULT NULL, PRIMARY KEY (`id`), KEY `score` (`score`,`created_at`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci INSERT INTO items (score, created_at) VALUES(1, "2014-09-10 00:00:00"); INSERT INTO items (score, created_at) VALUES(2, "2014-09-11 00:00:00"); INSERT INTO items (score, created_at) VALUES(2, "2014-09-11 00:00:00"); diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_all_used_less_than_or_equal.result b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_all_used_less_than_or_equal.result index db0cca7bfd3..91df05ff85e 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_all_used_less_than_or_equal.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_all_used_less_than_or_equal.result @@ -13,7 +13,7 @@ items CREATE TABLE `items` ( `created_at` datetime DEFAULT NULL, PRIMARY KEY (`id`), KEY `score` (`score`,`created_at`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci INSERT INTO items (score, created_at) VALUES(1, "2014-09-10 00:00:00"); INSERT INTO items (score, created_at) VALUES(2, "2014-09-11 00:00:00"); INSERT INTO items (score, created_at) VALUES(2, "2014-09-11 00:00:00"); diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_partially_used_have_prefix_greater_than.result b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_partially_used_have_prefix_greater_than.result index 41628e65ff7..3801cbe64fb 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_partially_used_have_prefix_greater_than.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_partially_used_have_prefix_greater_than.result @@ -15,7 +15,7 @@ items CREATE TABLE `items` ( `created_at` datetime DEFAULT NULL, PRIMARY KEY (`id`), KEY `score1` (`score1`,`created_at`,`score2`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci INSERT INTO items (score1, score2, created_at) VALUES(1, 0, "2015-07-01 00:00:00"); INSERT INTO items (score1, score2, created_at) VALUES(2, 0, "2015-07-01 00:00:00"); INSERT INTO items (score1, score2, created_at) VALUES(3, 0, "2015-07-01 00:00:00"); diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_partially_used_have_prefix_greater_than_or_equal.result b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_partially_used_have_prefix_greater_than_or_equal.result index 56919b64b3d..cd1f8d9ea8f 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_partially_used_have_prefix_greater_than_or_equal.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_partially_used_have_prefix_greater_than_or_equal.result @@ -15,7 +15,7 @@ items CREATE TABLE `items` ( `created_at` datetime DEFAULT NULL, PRIMARY KEY (`id`), KEY `score1` (`score1`,`created_at`,`score2`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci INSERT INTO items (score1, score2, created_at) VALUES(1, 0, "2015-07-01 00:00:00"); INSERT INTO items (score1, score2, created_at) VALUES(2, 0, "2015-07-01 00:00:00"); INSERT INTO items (score1, score2, created_at) VALUES(3, 0, "2015-07-01 00:00:00"); diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_partially_used_have_prefix_less_than.result b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_partially_used_have_prefix_less_than.result index 072200b0f38..77d01b59bc4 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_partially_used_have_prefix_less_than.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_partially_used_have_prefix_less_than.result @@ -15,7 +15,7 @@ items CREATE TABLE `items` ( `created_at` datetime DEFAULT NULL, PRIMARY KEY (`id`), KEY `score1` (`score1`,`created_at`,`score2`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci INSERT INTO items (score1, score2, created_at) VALUES(1, 0, "2015-07-01 00:00:00"); INSERT INTO items (score1, score2, created_at) VALUES(2, 0, "2015-07-01 00:00:00"); INSERT INTO items (score1, score2, created_at) VALUES(3, 0, "2015-07-01 00:00:00"); diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_partially_used_have_prefix_less_than_or_equal.result b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_partially_used_have_prefix_less_than_or_equal.result index 74c6aa46730..bae18b4dc05 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_partially_used_have_prefix_less_than_or_equal.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_partially_used_have_prefix_less_than_or_equal.result @@ -15,7 +15,7 @@ items CREATE TABLE `items` ( `created_at` datetime DEFAULT NULL, PRIMARY KEY (`id`), KEY `score1` (`score1`,`created_at`,`score2`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci INSERT INTO items (score1, score2, created_at) VALUES(1, 0, "2015-07-01 00:00:00"); INSERT INTO items (score1, score2, created_at) VALUES(2, 0, "2015-07-01 00:00:00"); INSERT INTO items (score1, score2, created_at) VALUES(3, 0, "2015-07-01 00:00:00"); diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_partially_used_no_prefix_greater_than.result b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_partially_used_no_prefix_greater_than.result index aca6e54a6e6..8786aa0b1dd 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_partially_used_no_prefix_greater_than.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_partially_used_no_prefix_greater_than.result @@ -15,7 +15,7 @@ items CREATE TABLE `items` ( `created_at` datetime DEFAULT NULL, PRIMARY KEY (`id`), KEY `created_at` (`created_at`,`score1`,`score2`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci INSERT INTO items (score1, score2, created_at) VALUES(1, 0, "2015-07-01 00:00:00"); INSERT INTO items (score1, score2, created_at) VALUES(2, 0, "2015-07-01 00:00:00"); INSERT INTO items (score1, score2, created_at) VALUES(2, 0, "2015-07-01 12:00:00"); diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_partially_used_no_prefix_greater_than_or_equal.result b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_partially_used_no_prefix_greater_than_or_equal.result index dd8b8f9125b..12fc3d6907f 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_partially_used_no_prefix_greater_than_or_equal.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_partially_used_no_prefix_greater_than_or_equal.result @@ -15,7 +15,7 @@ items CREATE TABLE `items` ( `created_at` datetime DEFAULT NULL, PRIMARY KEY (`id`), KEY `created_at` (`created_at`,`score1`,`score2`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci INSERT INTO items (score1, score2, created_at) VALUES(1, 0, "2015-07-01 00:00:00"); INSERT INTO items (score1, score2, created_at) VALUES(2, 0, "2015-07-01 00:00:00"); INSERT INTO items (score1, score2, created_at) VALUES(2, 0, "2015-07-01 12:00:00"); diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_partially_used_no_prefix_less_than.result b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_partially_used_no_prefix_less_than.result index 77fd2ce8511..c4ab234639b 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_partially_used_no_prefix_less_than.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_partially_used_no_prefix_less_than.result @@ -15,7 +15,7 @@ items CREATE TABLE `items` ( `created_at` datetime DEFAULT NULL, PRIMARY KEY (`id`), KEY `created_at` (`created_at`,`score1`,`score2`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci INSERT INTO items (score1, score2, created_at) VALUES(1, 0, "2015-07-01 00:00:00"); INSERT INTO items (score1, score2, created_at) VALUES(2, 0, "2015-07-01 00:00:00"); INSERT INTO items (score1, score2, created_at) VALUES(2, 0, "2015-07-01 12:00:00"); diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_partially_used_no_prefix_less_than_or_equal.result b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_partially_used_no_prefix_less_than_or_equal.result index 68daea5d5f5..40ba7c691ae 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_partially_used_no_prefix_less_than_or_equal.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_partially_used_no_prefix_less_than_or_equal.result @@ -15,7 +15,7 @@ items CREATE TABLE `items` ( `created_at` datetime DEFAULT NULL, PRIMARY KEY (`id`), KEY `created_at` (`created_at`,`score1`,`score2`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci INSERT INTO items (score1, score2, created_at) VALUES(1, 0, "2015-07-01 00:00:00"); INSERT INTO items (score1, score2, created_at) VALUES(2, 0, "2015-07-01 00:00:00"); INSERT INTO items (score1, score2, created_at) VALUES(2, 0, "2015-07-01 12:00:00"); diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_recreate.result b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_recreate.result index 53c9e8e87fa..89a0bb748e1 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_recreate.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_recreate.result @@ -14,7 +14,7 @@ listing CREATE TABLE `listing` ( `first_name` char(30) NOT NULL, PRIMARY KEY (`id`), KEY `name` (`last_name`,`first_name`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci insert into listing (last_name, first_name) values("Taro", "Yamada"); insert into listing (last_name, first_name) values("Taro", "Suzuki"); insert into listing (last_name, first_name) values("Jiro", "Yamada"); diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_replace.result b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_replace.result index aa236967647..d90dc689751 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_replace.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_replace.result @@ -13,7 +13,7 @@ scores CREATE TABLE `scores` ( `score` int(11) NOT NULL, PRIMARY KEY (`id`), KEY `property` (`name`,`score`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci INSERT INTO scores (name, score) VALUES("Taro Yamada", 29); INSERT INTO scores (name, score) VALUES("Taro Yamada", -12); INSERT INTO scores (name, score) VALUES("Jiro Yamada", 27); diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_select_int.result b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_select_int.result index adaf523be02..4ea2e5dd4f3 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_select_int.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_select_int.result @@ -13,7 +13,7 @@ scores CREATE TABLE `scores` ( `score` int(11) NOT NULL, PRIMARY KEY (`id`), KEY `property` (`score`,`name`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci INSERT INTO scores (name, score) VALUES("Taro Yamada", 29); INSERT INTO scores (name, score) VALUES("Taro Yamada", -12); INSERT INTO scores (name, score) VALUES("Jiro Yamada", 27); diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_select_string.result b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_select_string.result index 62b857bbb27..ab2131f8900 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_select_string.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_select_string.result @@ -14,7 +14,7 @@ listing CREATE TABLE `listing` ( `first_name` char(30) NOT NULL, PRIMARY KEY (`id`), KEY `name` (`last_name`,`first_name`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci insert into listing (last_name, first_name) values("Taro", "Yamada"); insert into listing (last_name, first_name) values("Taro", "Suzuki"); insert into listing (last_name, first_name) values("Jiro", "Yamada"); diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_select_varchar.result b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_select_varchar.result index 36b769ea515..4ffcaa00263 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_select_varchar.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_select_varchar.result @@ -15,7 +15,7 @@ scores CREATE TABLE `scores` ( `family_name` varchar(30) NOT NULL, `score` int(11) NOT NULL, PRIMARY KEY (`given_name`,`family_name`,`score`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci insert into scores values("Taro", "Yamada", 29); insert into scores values("Taro", "Yamada", -12); insert into scores values("Jiro", "Yamada", 27); diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_update_int.result b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_update_int.result index 91fef7bea42..735dc01bb2b 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_update_int.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_update_int.result @@ -13,7 +13,7 @@ scores CREATE TABLE `scores` ( `score` int(11) NOT NULL, PRIMARY KEY (`id`), KEY `property` (`score`,`name`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci INSERT INTO scores (name, score) VALUES("Taro Yamada", 29); INSERT INTO scores (name, score) VALUES("Taro Yamada", -12); INSERT INTO scores (name, score) VALUES("Jiro Yamada", 29); diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_update_string.result b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_update_string.result index 5dfcd916808..b4b8a828536 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_update_string.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_update_string.result @@ -14,7 +14,7 @@ scores CREATE TABLE `scores` ( `score` int(11) NOT NULL, PRIMARY KEY (`id`), KEY `property` (`name`,`score`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci insert into scores (name, score) values("Taro Yamada", 29); insert into scores (name, score) values("Taro Yamada", -12); insert into scores (name, score) values("Jiro Yamada", 27); diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/replace_vector.result b/storage/mroonga/mysql-test/mroonga/storage/r/replace_vector.result index 3e987631dba..49b2ba904f1 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/replace_vector.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/replace_vector.result @@ -2,13 +2,13 @@ DROP TABLE IF EXISTS vector_replace; DROP TABLE IF EXISTS vector_replace_vec; CREATE TABLE vector_replace_vec ( vec CHAR(10) PRIMARY KEY -) DEFAULT CHARSET=utf8 +) DEFAULT CHARSET=utf8 COLLATE utf8_general_ci COMMENT='default_tokenizer "TokenDelimit"'; CREATE TABLE vector_replace ( id INT NOT NULL, vec TEXT COMMENT 'flags "COLUMN_VECTOR", type "vector_replace_vec"', PRIMARY KEY(id) -) DEFAULT CHARSET=utf8; +) DEFAULT CHARSET=utf8 COLLATE utf8_general_ci; INSERT INTO vector_replace VALUES(1, 'first second third'); SELECT id, vec FROM vector_replace; id vec diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/variable_vector_column_delimiter.result b/storage/mroonga/mysql-test/mroonga/storage/r/variable_vector_column_delimiter.result index f3c8f1e8628..6a40acfd5ad 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/variable_vector_column_delimiter.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/variable_vector_column_delimiter.result @@ -2,14 +2,14 @@ DROP TABLE IF EXISTS document; DROP TABLE IF EXISTS category; CREATE TABLE category ( category CHAR(10) PRIMARY KEY -) DEFAULT CHARSET=utf8 +) DEFAULT CHARSET=utf8 COLLATE utf8_general_ci COMMENT='default_tokenizer "TokenDelimit"'; CREATE TABLE document ( id INT NOT NULL, title TEXT, categories TEXT COMMENT 'flags "COLUMN_VECTOR", type "category"', PRIMARY KEY(id) -) DEFAULT CHARSET=utf8; +) DEFAULT CHARSET=utf8 COLLATE utf8_general_ci; SHOW GLOBAL VARIABLES LIKE 'mroonga_vector_column_delimiter'; Variable_name Value mroonga_vector_column_delimiter diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/alter_table_add_column_multibyte_utf8.test b/storage/mroonga/mysql-test/mroonga/storage/t/alter_table_add_column_multibyte_utf8.test index 0ed92333e29..acfcd6fefd2 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/alter_table_add_column_multibyte_utf8.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/alter_table_add_column_multibyte_utf8.test @@ -31,7 +31,7 @@ SET NAMES utf8; CREATE TABLE users ( id int PRIMARY KEY -) DEFAULT CHARSET=utf8; +) DEFAULT CHARSET=utf8 COLLATE utf8_general_ci; ALTER TABLE users ADD COLUMN 名前 text, ADD FULLTEXT INDEX (名前); diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/alter_table_fulltext_add_table.test b/storage/mroonga/mysql-test/mroonga/storage/t/alter_table_fulltext_add_table.test index fd2a600896e..35441bf423b 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/alter_table_fulltext_add_table.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/alter_table_fulltext_add_table.test @@ -24,12 +24,12 @@ DROP TABLE IF EXISTS bugs; CREATE TABLE tags ( name VARCHAR(64) PRIMARY KEY -) DEFAULT CHARSET=utf8 COMMENT='default_tokenizer "TokenDelimit"'; +) DEFAULT CHARSET=utf8 COLLATE utf8_general_ci COMMENT='default_tokenizer "TokenDelimit"'; CREATE TABLE bugs ( id INT UNSIGNED PRIMARY KEY, tags VARCHAR(40) COMMENT 'type "tags"' -) DEFAULT CHARSET=utf8; +) DEFAULT CHARSET=utf8 COLLATE utf8_general_ci; INSERT INTO tags (name) VALUES ("Groonga"); INSERT INTO bugs (id, tags) VALUES (1, "Groonga Mroonga"); diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/alter_table_fulltext_drop_table.test b/storage/mroonga/mysql-test/mroonga/storage/t/alter_table_fulltext_drop_table.test index d59e24f4753..6a7ba9db806 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/alter_table_fulltext_drop_table.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/alter_table_fulltext_drop_table.test @@ -24,13 +24,13 @@ DROP TABLE IF EXISTS bugs; CREATE TABLE tags ( name VARCHAR(64) PRIMARY KEY -) DEFAULT CHARSET=utf8 COMMENT='default_tokenizer "TokenDelimit"'; +) DEFAULT CHARSET=utf8 COLLATE utf8_general_ci COMMENT='default_tokenizer "TokenDelimit"'; CREATE TABLE bugs ( id INT UNSIGNED PRIMARY KEY, tags VARCHAR(40) COMMENT 'type "tags"', FULLTEXT INDEX bugs_tags_index (tags) COMMENT 'table "tags"' -) DEFAULT CHARSET=utf8; +) DEFAULT CHARSET=utf8 COLLATE utf8_general_ci; INSERT INTO tags (name) VALUES ("Groonga"); INSERT INTO bugs (id, tags) VALUES (1, "Groonga Mroonga"); diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/column_groonga_index_fulltext_other_table.test b/storage/mroonga/mysql-test/mroonga/storage/t/column_groonga_index_fulltext_other_table.test index d171d062d16..b07fd457202 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/column_groonga_index_fulltext_other_table.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/column_groonga_index_fulltext_other_table.test @@ -19,14 +19,14 @@ CREATE TABLE terms ( name VARCHAR(64) PRIMARY KEY -) DEFAULT CHARSET=utf8 +) DEFAULT CHARSET=utf8 COLLATE utf8_general_ci COMMENT='default_tokenizer "TokenBigram"'; CREATE TABLE bugs ( id INT UNSIGNED PRIMARY KEY, title TEXT, FULLTEXT INDEX (title) COMMENT 'table "terms"' -) DEFAULT CHARSET=utf8; +) DEFAULT CHARSET=utf8 COLLATE utf8_general_ci; INSERT INTO bugs (id, title) VALUES (1, "Mroonga can't build with MySQL X.Y.Z"); diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/column_multibyte_utf8.test b/storage/mroonga/mysql-test/mroonga/storage/t/column_multibyte_utf8.test index efbaf31fae5..c3a5b787bc1 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/column_multibyte_utf8.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/column_multibyte_utf8.test @@ -32,7 +32,7 @@ SET NAMES utf8; CREATE TABLE users ( 名前 text, FULLTEXT INDEX (名前) -) DEFAULT CHARSET=utf8; +) DEFAULT CHARSET=utf8 COLLATE utf8_general_ci; INSERT INTO users VALUES ("やまだ"); INSERT INTO users VALUES ("たなか"); diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/function_command_special-database-name.test b/storage/mroonga/mysql-test/mroonga/storage/t/function_command_special-database-name.test index 720c547c0f7..169bb0d1306 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/function_command_special-database-name.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/function_command_special-database-name.test @@ -28,7 +28,7 @@ SET NAMES UTF8; CREATE TABLE diaries ( title TEXT, FULLTEXT KEY (title) -) DEFAULT CHARSET=utf8; +) DEFAULT CHARSET=utf8 COLLATE utf8_general_ci; SELECT mroonga_command('dump --dump_plugins no'); diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/replace_vector.test b/storage/mroonga/mysql-test/mroonga/storage/t/replace_vector.test index 72d233bc577..44270be3c99 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/replace_vector.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/replace_vector.test @@ -23,14 +23,14 @@ DROP TABLE IF EXISTS vector_replace_vec; CREATE TABLE vector_replace_vec ( vec CHAR(10) PRIMARY KEY -) DEFAULT CHARSET=utf8 +) DEFAULT CHARSET=utf8 COLLATE utf8_general_ci COMMENT='default_tokenizer "TokenDelimit"'; CREATE TABLE vector_replace ( id INT NOT NULL, vec TEXT COMMENT 'flags "COLUMN_VECTOR", type "vector_replace_vec"', PRIMARY KEY(id) -) DEFAULT CHARSET=utf8; +) DEFAULT CHARSET=utf8 COLLATE utf8_general_ci; INSERT INTO vector_replace VALUES(1, 'first second third'); SELECT id, vec FROM vector_replace; REPLACE INTO vector_replace VALUES(1, 'fourth fifth'); diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/variable_vector_column_delimiter.test b/storage/mroonga/mysql-test/mroonga/storage/t/variable_vector_column_delimiter.test index 94e8cb9babb..44e1a0b88d1 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/variable_vector_column_delimiter.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/variable_vector_column_delimiter.test @@ -25,7 +25,7 @@ DROP TABLE IF EXISTS category; CREATE TABLE category ( category CHAR(10) PRIMARY KEY -) DEFAULT CHARSET=utf8 +) DEFAULT CHARSET=utf8 COLLATE utf8_general_ci COMMENT='default_tokenizer "TokenDelimit"'; CREATE TABLE document ( @@ -33,7 +33,7 @@ CREATE TABLE document ( title TEXT, categories TEXT COMMENT 'flags "COLUMN_VECTOR", type "category"', PRIMARY KEY(id) -) DEFAULT CHARSET=utf8; +) DEFAULT CHARSET=utf8 COLLATE utf8_general_ci; SHOW GLOBAL VARIABLES LIKE 'mroonga_vector_column_delimiter'; diff --git a/storage/mroonga/mysql-test/mroonga/wrapper/r/alter_table_add_column_multibyte_utf8.result b/storage/mroonga/mysql-test/mroonga/wrapper/r/alter_table_add_column_multibyte_utf8.result index abd2271f051..4b63faf94ea 100644 --- a/storage/mroonga/mysql-test/mroonga/wrapper/r/alter_table_add_column_multibyte_utf8.result +++ b/storage/mroonga/mysql-test/mroonga/wrapper/r/alter_table_add_column_multibyte_utf8.result @@ -2,7 +2,7 @@ DROP TABLE IF EXISTS users; SET NAMES utf8; CREATE TABLE users ( id int unsigned PRIMARY KEY AUTO_INCREMENT -) DEFAULT CHARSET=utf8 COMMENT='Engine "InnoDB"'; +) DEFAULT CHARSET=utf8 COLLATE utf8_general_ci COMMENT='Engine "InnoDB"'; ALTER TABLE users ADD COLUMN 名前 text, ADD FULLTEXT INDEX (名前); diff --git a/storage/mroonga/mysql-test/mroonga/wrapper/r/alter_table_change_column_comment.result b/storage/mroonga/mysql-test/mroonga/wrapper/r/alter_table_change_column_comment.result index a56ae08dd9f..7acec78ec54 100644 --- a/storage/mroonga/mysql-test/mroonga/wrapper/r/alter_table_change_column_comment.result +++ b/storage/mroonga/mysql-test/mroonga/wrapper/r/alter_table_change_column_comment.result @@ -13,5 +13,5 @@ bugs CREATE TABLE `bugs` ( `id` int(10) unsigned NOT NULL, `tag` varchar(64) DEFAULT NULL COMMENT 'It must consist of only alphabet and number.', PRIMARY KEY (`id`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci COMMENT='engine "InnoDB"' +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci COMMENT='engine "InnoDB"' DROP TABLE bugs; diff --git a/storage/mroonga/mysql-test/mroonga/wrapper/r/column_comment_index_not_for_mroonga.result b/storage/mroonga/mysql-test/mroonga/wrapper/r/column_comment_index_not_for_mroonga.result index 708055b6464..717fbef61fd 100644 --- a/storage/mroonga/mysql-test/mroonga/wrapper/r/column_comment_index_not_for_mroonga.result +++ b/storage/mroonga/mysql-test/mroonga/wrapper/r/column_comment_index_not_for_mroonga.result @@ -12,5 +12,5 @@ bugs CREATE TABLE `bugs` ( `tag` varchar(64) DEFAULT NULL, PRIMARY KEY (`id`), KEY `tag` (`tag`) COMMENT 'Tag search is required.' -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci COMMENT='engine "InnoDB"' +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci COMMENT='engine "InnoDB"' DROP TABLE bugs; diff --git a/storage/mroonga/mysql-test/mroonga/wrapper/r/column_multibyte_utf8.result b/storage/mroonga/mysql-test/mroonga/wrapper/r/column_multibyte_utf8.result index 2d31307392f..85f3afc8109 100644 --- a/storage/mroonga/mysql-test/mroonga/wrapper/r/column_multibyte_utf8.result +++ b/storage/mroonga/mysql-test/mroonga/wrapper/r/column_multibyte_utf8.result @@ -4,7 +4,7 @@ CREATE TABLE users ( id int unsigned PRIMARY KEY AUTO_INCREMENT, 名前 text, FULLTEXT INDEX (名前) -) DEFAULT CHARSET=utf8 COMMENT='Engine "InnoDB"'; +) DEFAULT CHARSET=utf8 COLLATE utf8_general_ci COMMENT='Engine "InnoDB"'; INSERT INTO users (名前) VALUES ("やまだ"); INSERT INTO users (名前) VALUES ("たなか"); INSERT INTO users (名前) VALUES ("すずき"); diff --git a/storage/mroonga/mysql-test/mroonga/wrapper/r/column_normal_comment.result b/storage/mroonga/mysql-test/mroonga/wrapper/r/column_normal_comment.result index 9c4b974ca40..37f8eb84efe 100644 --- a/storage/mroonga/mysql-test/mroonga/wrapper/r/column_normal_comment.result +++ b/storage/mroonga/mysql-test/mroonga/wrapper/r/column_normal_comment.result @@ -9,5 +9,5 @@ bugs CREATE TABLE `bugs` ( `id` int(10) unsigned NOT NULL, `tag` varchar(64) DEFAULT NULL COMMENT 'It must consist of only alphabet and number.', PRIMARY KEY (`id`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci COMMENT='engine "InnoDB"' +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci COMMENT='engine "InnoDB"' DROP TABLE bugs; diff --git a/storage/mroonga/mysql-test/mroonga/wrapper/r/create_table_flags_parameter.result b/storage/mroonga/mysql-test/mroonga/wrapper/r/create_table_flags_parameter.result index 39bf778cac9..36b482593c6 100644 --- a/storage/mroonga/mysql-test/mroonga/wrapper/r/create_table_flags_parameter.result +++ b/storage/mroonga/mysql-test/mroonga/wrapper/r/create_table_flags_parameter.result @@ -9,7 +9,7 @@ memos CREATE TABLE `memos` ( `content` varchar(64) NOT NULL, PRIMARY KEY (`content`), FULLTEXT KEY `content` (`content`) `FLAGS`='WITH_POSITION|WITH_WEIGHT' -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci COMMENT='ENGINE "InnoDB"' +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci COMMENT='ENGINE "InnoDB"' SELECT mroonga_command("dump --dump_plugins no --dump_schema no"); mroonga_command("dump --dump_plugins no --dump_schema no") column_create memos#content index COLUMN_INDEX|WITH_WEIGHT|WITH_POSITION memos diff --git a/storage/mroonga/mysql-test/mroonga/wrapper/r/create_table_normalizer_comment.result b/storage/mroonga/mysql-test/mroonga/wrapper/r/create_table_normalizer_comment.result index 97f900a19b8..4927b96b1a2 100644 --- a/storage/mroonga/mysql-test/mroonga/wrapper/r/create_table_normalizer_comment.result +++ b/storage/mroonga/mysql-test/mroonga/wrapper/r/create_table_normalizer_comment.result @@ -12,7 +12,7 @@ memos CREATE TABLE `memos` ( `content` text NOT NULL, PRIMARY KEY (`id`), FULLTEXT KEY `content` (`content`) COMMENT 'normalizer "NormalizerAuto"' -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci COMMENT='ENGINE "InnoDB"' +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci COMMENT='ENGINE "InnoDB"' INSERT INTO memos VALUES (1, "1日の消費㌍は約2000㌔㌍"); SELECT * FROM memos WHERE MATCH (content) AGAINST ("+カロリー" IN BOOLEAN MODE); diff --git a/storage/mroonga/mysql-test/mroonga/wrapper/r/create_table_normalizer_parameter.result b/storage/mroonga/mysql-test/mroonga/wrapper/r/create_table_normalizer_parameter.result index b81407b6f59..14af3831436 100644 --- a/storage/mroonga/mysql-test/mroonga/wrapper/r/create_table_normalizer_parameter.result +++ b/storage/mroonga/mysql-test/mroonga/wrapper/r/create_table_normalizer_parameter.result @@ -12,7 +12,7 @@ memos CREATE TABLE `memos` ( `content` text NOT NULL, PRIMARY KEY (`id`), FULLTEXT KEY `content` (`content`) `NORMALIZER`='NormalizerAuto' -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci COMMENT='ENGINE "InnoDB"' +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci COMMENT='ENGINE "InnoDB"' INSERT INTO memos VALUES (1, "1日の消費㌍は約2000㌔㌍"); SELECT * FROM memos WHERE MATCH (content) AGAINST ("+カロリー" IN BOOLEAN MODE); diff --git a/storage/mroonga/mysql-test/mroonga/wrapper/r/insert_on_duplicate_key_update_multiple_column_primary_key_myisam.result b/storage/mroonga/mysql-test/mroonga/wrapper/r/insert_on_duplicate_key_update_multiple_column_primary_key_myisam.result index c03e8c14467..9c37259a459 100644 --- a/storage/mroonga/mysql-test/mroonga/wrapper/r/insert_on_duplicate_key_update_multiple_column_primary_key_myisam.result +++ b/storage/mroonga/mysql-test/mroonga/wrapper/r/insert_on_duplicate_key_update_multiple_column_primary_key_myisam.result @@ -12,7 +12,7 @@ diaries CREATE TABLE `diaries` ( `title` varchar(100) NOT NULL, `content` text NOT NULL, PRIMARY KEY (`date`,`title`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci COMMENT='ENGINE "MyISAM"' +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci COMMENT='ENGINE "MyISAM"' INSERT INTO diaries (date, title, content) VALUES ("2012-03-04", "cloudy day", "Today is cloudy day..."); INSERT INTO diaries (date, title, content) diff --git a/storage/mroonga/mysql-test/mroonga/wrapper/r/insert_on_duplicate_key_update_multiple_column_unique_index_myisam.result b/storage/mroonga/mysql-test/mroonga/wrapper/r/insert_on_duplicate_key_update_multiple_column_unique_index_myisam.result index ee82a9ebd8e..dc7cb3bdd72 100644 --- a/storage/mroonga/mysql-test/mroonga/wrapper/r/insert_on_duplicate_key_update_multiple_column_unique_index_myisam.result +++ b/storage/mroonga/mysql-test/mroonga/wrapper/r/insert_on_duplicate_key_update_multiple_column_unique_index_myisam.result @@ -15,7 +15,7 @@ diaries CREATE TABLE `diaries` ( `content` text NOT NULL, PRIMARY KEY (`id`), UNIQUE KEY `date` (`date`,`title`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci COMMENT='ENGINE "MyISAM"' +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci COMMENT='ENGINE "MyISAM"' INSERT INTO diaries (date, title, content) VALUES ("2012-03-04", "cloudy day", "Today is cloudy day..."); INSERT INTO diaries (date, title, content) diff --git a/storage/mroonga/mysql-test/mroonga/wrapper/r/performance_schema.result b/storage/mroonga/mysql-test/mroonga/wrapper/r/performance_schema.result index b06cd8af972..27a0edf329c 100644 --- a/storage/mroonga/mysql-test/mroonga/wrapper/r/performance_schema.result +++ b/storage/mroonga/mysql-test/mroonga/wrapper/r/performance_schema.result @@ -14,7 +14,7 @@ diaries CREATE TABLE `diaries` ( `content` varchar(255) DEFAULT NULL, PRIMARY KEY (`id`), FULLTEXT KEY `content` (`content`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci COMMENT='ENGINE "InnoDB"' +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci COMMENT='ENGINE "InnoDB"' INSERT INTO diaries (content) VALUES ("Tommorow will be shiny day!"); SHOW TABLES FROM performance_schema LIKE 'threads'; Tables_in_performance_schema (threads) diff --git a/storage/mroonga/mysql-test/mroonga/wrapper/r/transaction_query_cache.result b/storage/mroonga/mysql-test/mroonga/wrapper/r/transaction_query_cache.result index b08d1c0c52d..6aec31aa65e 100644 --- a/storage/mroonga/mysql-test/mroonga/wrapper/r/transaction_query_cache.result +++ b/storage/mroonga/mysql-test/mroonga/wrapper/r/transaction_query_cache.result @@ -9,7 +9,7 @@ Table Create Table simple_table CREATE TABLE `simple_table` ( `id` int(11) NOT NULL, PRIMARY KEY (`id`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci COMMENT='ENGINE "InnoDB"' +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci COMMENT='ENGINE "InnoDB"' INSERT INTO simple_table (id) VALUES (1),(2); USE test; START TRANSACTION; diff --git a/storage/mroonga/mysql-test/mroonga/wrapper/t/alter_table_add_column_multibyte_utf8.test b/storage/mroonga/mysql-test/mroonga/wrapper/t/alter_table_add_column_multibyte_utf8.test index f98d0e0da2c..81a7775c4a2 100644 --- a/storage/mroonga/mysql-test/mroonga/wrapper/t/alter_table_add_column_multibyte_utf8.test +++ b/storage/mroonga/mysql-test/mroonga/wrapper/t/alter_table_add_column_multibyte_utf8.test @@ -32,7 +32,7 @@ SET NAMES utf8; CREATE TABLE users ( id int unsigned PRIMARY KEY AUTO_INCREMENT -) DEFAULT CHARSET=utf8 COMMENT='Engine "InnoDB"'; +) DEFAULT CHARSET=utf8 COLLATE utf8_general_ci COMMENT='Engine "InnoDB"'; ALTER TABLE users ADD COLUMN 名前 text, ADD FULLTEXT INDEX (名前); diff --git a/storage/mroonga/mysql-test/mroonga/wrapper/t/column_multibyte_utf8.test b/storage/mroonga/mysql-test/mroonga/wrapper/t/column_multibyte_utf8.test index c646a1d2eba..a2d7a4dbb04 100644 --- a/storage/mroonga/mysql-test/mroonga/wrapper/t/column_multibyte_utf8.test +++ b/storage/mroonga/mysql-test/mroonga/wrapper/t/column_multibyte_utf8.test @@ -34,7 +34,7 @@ CREATE TABLE users ( id int unsigned PRIMARY KEY AUTO_INCREMENT, 名前 text, FULLTEXT INDEX (名前) -) DEFAULT CHARSET=utf8 COMMENT='Engine "InnoDB"'; +) DEFAULT CHARSET=utf8 COLLATE utf8_general_ci COMMENT='Engine "InnoDB"'; INSERT INTO users (名前) VALUES ("やまだ"); INSERT INTO users (名前) VALUES ("たなか"); diff --git a/storage/rocksdb/mysql-test/rocksdb/r/alter_table.result b/storage/rocksdb/mysql-test/rocksdb/r/alter_table.result index 4ba9834a279..17a9aa5f0b7 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/alter_table.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/alter_table.result @@ -159,15 +159,15 @@ t1 CREATE TABLE `t1` ( `b` char(8) DEFAULT NULL, `c` char(8) DEFAULT NULL, PRIMARY KEY (`pk`) -) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci ALTER TABLE t1 DEFAULT CHARACTER SET = latin1 COLLATE latin1_general_ci; SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `pk` int(11) NOT NULL, `a` int(11) DEFAULT NULL, - `b` char(8) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL, - `c` char(8) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL, + `b` char(8) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL, + `c` char(8) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL, PRIMARY KEY (`pk`) ) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci ALTER TABLE t1 FORCE; @@ -176,8 +176,8 @@ Table Create Table t1 CREATE TABLE `t1` ( `pk` int(11) NOT NULL, `a` int(11) DEFAULT NULL, - `b` char(8) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL, - `c` char(8) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL, + `b` char(8) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL, + `c` char(8) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL, PRIMARY KEY (`pk`) ) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci DROP TABLE t1; diff --git a/storage/rocksdb/mysql-test/rocksdb/r/show_table_status.result b/storage/rocksdb/mysql-test/rocksdb/r/show_table_status.result index 358bfa14af9..3e8483ae50a 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/show_table_status.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/show_table_status.result @@ -9,7 +9,7 @@ SHOW TABLE STATUS WHERE name IN ( 't1', 't2', 't3' ); Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment Max_index_length Temporary t1 ROCKSDB 10 Fixed 1000 # # 0 0 0 NULL # # NULL latin1_swedish_ci NULL 0 N t2 ROCKSDB 10 Fixed 1000 # # 0 0 0 NULL # # NULL latin1_swedish_ci NULL 0 N -t3 ROCKSDB 10 Fixed 1000 # # 0 0 0 NULL # # NULL utf8mb3_general_ci NULL 0 N +t3 ROCKSDB 10 Fixed 1000 # # 0 0 0 NULL # # NULL utf8mb3_uca1400_ai_ci NULL 0 N SHOW TABLE STATUS WHERE name LIKE 't2'; Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment Max_index_length Temporary t2 ROCKSDB 10 Fixed 1000 # # 0 0 0 NULL # # NULL latin1_swedish_ci NULL 0 N diff --git a/storage/spider/mysql-test/spider/feature/r/engine_defined_attributes.result b/storage/spider/mysql-test/spider/feature/r/engine_defined_attributes.result index fcdc1ac8d17..f3d15ce9472 100644 --- a/storage/spider/mysql-test/spider/feature/r/engine_defined_attributes.result +++ b/storage/spider/mysql-test/spider/feature/r/engine_defined_attributes.result @@ -93,7 +93,7 @@ tbl_a CREATE TABLE `tbl_a` ( `a` int(11) NOT NULL, `b` varchar(255) DEFAULT NULL, PRIMARY KEY (`a`) -) ENGINE=SPIDER DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci `REMOTE_SERVER`='s_2_1' `REMOTE_TABLE`='tbl_a' `READ_ONLY`=1 +) ENGINE=SPIDER DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci `REMOTE_SERVER`='s_2_1' `REMOTE_TABLE`='tbl_a' `READ_ONLY`=1 INSERT INTO tbl_a VALUES (1, "aaa"), (2, "bbb"), (3, "ccc"), (4, "ddd"); ERROR HY000: Table 'auto_test_local.tbl_a' is read only SELECT * FROM tbl_a; @@ -251,7 +251,7 @@ tbl_a CREATE TABLE `tbl_a` ( `a` int(11) NOT NULL, `b` varchar(255) DEFAULT NULL, PRIMARY KEY (`a`) -) ENGINE=SPIDER DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci `REMOTE_SERVER`='s_2_1' `REMOTE_TABLE`='tbl_a' `READ_ONLY`=1 +) ENGINE=SPIDER DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci `REMOTE_SERVER`='s_2_1' `REMOTE_TABLE`='tbl_a' `READ_ONLY`=1 INSERT INTO tbl_a VALUES (1, "aaa"), (2, "bbb"), (3, "ccc"), (4, "ddd"); ERROR HY000: Table 'auto_test_local.tbl_a' is read only SELECT * FROM tbl_a; @@ -270,7 +270,7 @@ tbl_a CREATE TABLE `tbl_a` ( `a` int(11) NOT NULL, `b` varchar(255) DEFAULT NULL, PRIMARY KEY (`a`) -) ENGINE=SPIDER DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci `REMOTE_SERVER`='s_2_1' `REMOTE_TABLE`='tbl_a' `READ_ONLY`=1 +) ENGINE=SPIDER DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci `REMOTE_SERVER`='s_2_1' `REMOTE_TABLE`='tbl_a' `READ_ONLY`=1 INSERT INTO tbl_a VALUES (1, "aaa"), (2, "bbb"), (3, "ccc"), (4, "ddd"); ERROR HY000: Table 'auto_test_local.tbl_a' is read only ALTER TABLE tbl_a READ_ONLY=0; @@ -281,7 +281,7 @@ tbl_a CREATE TABLE `tbl_a` ( `a` int(11) NOT NULL, `b` varchar(255) DEFAULT NULL, PRIMARY KEY (`a`) -) ENGINE=SPIDER DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci `REMOTE_SERVER`='s_2_1' `REMOTE_TABLE`='tbl_a' `READ_ONLY`=0 +) ENGINE=SPIDER DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci `REMOTE_SERVER`='s_2_1' `REMOTE_TABLE`='tbl_a' `READ_ONLY`=0 SELECT * FROM tbl_a; a b 1 aaa diff --git a/storage/spider/mysql-test/spider/r/direct_join.result b/storage/spider/mysql-test/spider/r/direct_join.result index fcfed12ea6c..1bea7a9f385 100644 --- a/storage/spider/mysql-test/spider/r/direct_join.result +++ b/storage/spider/mysql-test/spider/r/direct_join.result @@ -126,7 +126,7 @@ tbl_person CREATE TABLE `tbl_person` ( `region_code` varchar(50) DEFAULT NULL, `region` int(11) NOT NULL, PRIMARY KEY (`id`,`region`) USING BTREE -) ENGINE=SPIDER DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci ROW_FORMAT=DYNAMIC COMMENT='table "tbl_ncd_cm_person"' +) ENGINE=SPIDER DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci ROW_FORMAT=DYNAMIC COMMENT='table "tbl_ncd_cm_person"' PARTITION BY LIST COLUMNS(`region`) (PARTITION `pt1` VALUES IN (510411) COMMENT = 'tbl "tbl_person", srv "s_2_1"' ENGINE = SPIDER) CREATE TABLE tbl_ncd_cm_person ( @@ -147,7 +147,7 @@ tbl_ncd_cm_person CREATE TABLE `tbl_ncd_cm_person` ( `diseaseKind_id` varchar(50) DEFAULT NULL, `region` int(11) NOT NULL, PRIMARY KEY (`id`,`region`) USING BTREE -) ENGINE=SPIDER DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci ROW_FORMAT=DYNAMIC +) ENGINE=SPIDER DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci ROW_FORMAT=DYNAMIC PARTITION BY LIST COLUMNS(`region`) (PARTITION `pt1` VALUES IN (510411) COMMENT = 'tbl "tbl_ncd_cm_person", srv "s_2_1"' ENGINE = SPIDER) INSERT INTO tbl_person VALUES ('24FC3F0A5119432BAE13DD65AABAA39C', diff --git a/storage/spider/mysql-test/spider/r/timestamp.result b/storage/spider/mysql-test/spider/r/timestamp.result index 3eb4d1dab1c..ce694b0d3fa 100644 --- a/storage/spider/mysql-test/spider/r/timestamp.result +++ b/storage/spider/mysql-test/spider/r/timestamp.result @@ -71,7 +71,7 @@ tbl_a CREATE TABLE `tbl_a` ( `col_ts` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), PRIMARY KEY (`col_a`), UNIQUE KEY `i_ts` (`col_ts`) -) ENGINE=SPIDER AUTO_INCREMENT=17 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='database "ts_test_remote", table "tbl_a", srv "s_2_1"' +) ENGINE=SPIDER AUTO_INCREMENT=17 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='database "ts_test_remote", table "tbl_a", srv "s_2_1"' SHOW CREATE TABLE tbl_f; Table Create Table tbl_f CREATE TABLE `tbl_f` ( @@ -283,7 +283,7 @@ tbl_a CREATE TABLE `tbl_a` ( `col_dt` datetime DEFAULT NULL, `col_ts` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), PRIMARY KEY (`col_a`) -) ENGINE=InnoDB AUTO_INCREMENT=17 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci +) ENGINE=InnoDB AUTO_INCREMENT=17 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci TRUNCATE TABLE mysql.general_log; connection master_1; DROP INDEX i_ts ON tbl_a; @@ -294,7 +294,7 @@ tbl_a CREATE TABLE `tbl_a` ( `col_dt` datetime DEFAULT NULL, `col_ts` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), PRIMARY KEY (`col_a`) -) ENGINE=SPIDER AUTO_INCREMENT=17 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='database "ts_test_remote", table "tbl_a", srv "s_2_1"' +) ENGINE=SPIDER AUTO_INCREMENT=17 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci COMMENT='database "ts_test_remote", table "tbl_a", srv "s_2_1"' Retry lookups on unindexed timestamp column connection child2_1; diff --git a/storage/test_sql_discovery/mysql-test/sql_discovery/simple.result b/storage/test_sql_discovery/mysql-test/sql_discovery/simple.result index 56c61cb8b39..b4998436b91 100644 --- a/storage/test_sql_discovery/mysql-test/sql_discovery/simple.result +++ b/storage/test_sql_discovery/mysql-test/sql_discovery/simple.result @@ -133,7 +133,7 @@ t1 CREATE TABLE t1 ( KEY d (d,b), SPATIAL KEY f (f), FULLTEXT KEY e (e) -) ENGINE=TEST_SQL_DISCOVERY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci MIN_ROWS=10 MAX_ROWS=100 CHECKSUM=1 COMMENT='abc' +) ENGINE=TEST_SQL_DISCOVERY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci MIN_ROWS=10 MAX_ROWS=100 CHECKSUM=1 COMMENT='abc' show status like 'handler_discover'; Variable_name Value Handler_discover 16 diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c index 0033c5f5307..20ceea8c5d5 100644 --- a/tests/mysql_client_test.c +++ b/tests/mysql_client_test.c @@ -17438,7 +17438,7 @@ static void test_bug30472() DIE_UNLESS(strcmp(character_set_name_4, "utf8mb3") == 0); DIE_UNLESS(strcmp(character_set_client_4, "utf8mb3") == 0); DIE_UNLESS(strcmp(character_set_results_4, "utf8mb3") == 0); - DIE_UNLESS(strcmp(collation_connnection_4, "utf8mb3_general_ci") == 0); + DIE_UNLESS(strcmp(collation_connnection_4, "utf8mb3_uca1400_ai_ci") == 0); /* That's it. Cleanup. */ @@ -20532,7 +20532,7 @@ static void test_mdev14454() { myheader("test_mdev14454"); test_mdev14454_internal("SET NAMES latin1", 8, "test\xFF"); - test_mdev14454_internal("SET NAMES utf8", 33, "test\xC3\xBF"); + test_mdev14454_internal("SET NAMES utf8 COLLATE utf8_general_ci", 33, "test\xC3\xBF"); }