diff options
Diffstat (limited to 'plugin')
32 files changed, 149 insertions, 149 deletions
diff --git a/plugin/disks/mysql-test/disks/disks.result b/plugin/disks/mysql-test/disks/disks.result index 38dfcf351a5..888f2df64f7 100644 --- a/plugin/disks/mysql-test/disks/disks.result +++ b/plugin/disks/mysql-test/disks/disks.result @@ -6,7 +6,7 @@ DISKS CREATE TEMPORARY TABLE `DISKS` ( `Total` bigint(32) NOT NULL, `Used` bigint(32) NOT NULL, `Available` bigint(32) NOT NULL -) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 +) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci select sum(Total) > sum(Available), sum(Total)>sum(Used) from information_schema.disks; sum(Total) > sum(Available) sum(Total)>sum(Used) 1 1 diff --git a/plugin/query_response_time/mysql-test/query_response_time/basic.result b/plugin/query_response_time/mysql-test/query_response_time/basic.result index 8f25804e253..48bcdfa12ca 100644 --- a/plugin/query_response_time/mysql-test/query_response_time/basic.result +++ b/plugin/query_response_time/mysql-test/query_response_time/basic.result @@ -9,7 +9,7 @@ QUERY_RESPONSE_TIME CREATE TEMPORARY TABLE `QUERY_RESPONSE_TIME` ( `TIME` varchar(14) NOT NULL, `COUNT` int(11) unsigned NOT NULL, `TOTAL` varchar(14) NOT NULL -) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 +) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci SELECT PLUGIN_NAME, PLUGIN_VERSION, PLUGIN_TYPE, PLUGIN_AUTHOR, PLUGIN_DESCRIPTION, PLUGIN_LICENSE, PLUGIN_MATURITY FROM INFORMATION_SCHEMA.PLUGINS WHERE PLUGIN_NAME LIKE 'query_response_time%';; PLUGIN_NAME QUERY_RESPONSE_TIME PLUGIN_VERSION 1.0 diff --git a/plugin/type_inet/mysql-test/type_inet/type_inet6-debug.result b/plugin/type_inet/mysql-test/type_inet/type_inet6-debug.result index 0e879aad58f..2be7aca4107 100644 --- a/plugin/type_inet/mysql-test/type_inet/type_inet6-debug.result +++ b/plugin/type_inet/mysql-test/type_inet/type_inet6-debug.result @@ -14,5 +14,5 @@ Table Create Table t1 CREATE TABLE `t1` ( `c01` inet6 DEFAULT NULL, `c02` inet6 DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; 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 c1074e9e44d..838a7ee49d3 100644 --- a/plugin/type_inet/mysql-test/type_inet/type_inet6.result +++ b/plugin/type_inet/mysql-test/type_inet/type_inet6.result @@ -8,7 +8,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `a` inet6 DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DESCRIBE t1; Field Type Null Key Default Extra a inet6 YES NULL @@ -64,7 +64,7 @@ t1 CREATE TABLE `t1` ( `c3` inet6 DEFAULT '::', `c4` inet6 DEFAULT 'ffff::ffff', `c5` inet6 DEFAULT cast(X'ffffffffffffffffffffffffffffffff' as inet6) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DESCRIBE t1; Field Type Null Key Default Extra c1 inet6 YES :: @@ -222,7 +222,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `CAST('::' AS INET6)` inet6 NOT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; # # Text and binary formats, comparison operators @@ -428,7 +428,7 @@ t2 CREATE TABLE `t2` ( `COALESCE(c, c_text)` inet6 DEFAULT NULL, `COALESCE(c, c_mediumtext)` inet6 DEFAULT NULL, `COALESCE(c, c_longtext)` inet6 DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t2; CREATE TABLE t2 AS SELECT LEAST(c, c_char), @@ -447,7 +447,7 @@ t2 CREATE TABLE `t2` ( `LEAST(c, c_text)` inet6 DEFAULT NULL, `LEAST(c, c_mediumtext)` inet6 DEFAULT NULL, `LEAST(c, c_longtext)` inet6 DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t2; DROP TABLE t1; CREATE TABLE t1 (a INET6); @@ -478,7 +478,7 @@ t2 CREATE TABLE `t2` ( `COALESCE(a, '::')` inet6 DEFAULT NULL, `LEAST(a,'::')` inet6 DEFAULT NULL, `GREATEST(a,'::')` inet6 DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t2; SELECT COALESCE(a, 0x00000000000000000000000000000000) FROM t1 ORDER BY a; COALESCE(a, 0x00000000000000000000000000000000) @@ -512,7 +512,7 @@ t2 CREATE TABLE `t2` ( `COALESCE(a, 0x00000000000000000000000000000000)` inet6 DEFAULT NULL, `LEAST(a,0x00000000000000000000000000000000)` inet6 DEFAULT NULL, `GREATEST(a,0x00000000000000000000000000000000)` inet6 DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t2; SELECT COALESCE(a, 10) FROM t1; ERROR HY000: Illegal parameter data types inet6 and int for operation 'coalesce' @@ -720,7 +720,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `a` varchar(39) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a INET6); INSERT INTO t1 VALUES ('ffff::ffff'); @@ -743,7 +743,7 @@ t2 CREATE TABLE `t2` ( `CAST(a AS CHAR(66000))` mediumtext DEFAULT NULL, `CAST(a AS CHAR(16777215))` mediumtext DEFAULT NULL, `CAST(a AS CHAR(16777216))` longtext DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SELECT * FROM t2; CAST(a AS CHAR) ffff::ffff CAST(a AS CHAR(39)) ffff::ffff @@ -779,7 +779,7 @@ t2 CREATE TABLE `t2` ( `cb66000` mediumblob DEFAULT NULL, `cb16777215` mediumblob DEFAULT NULL, `cb16777216` longblob DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t2; CREATE TABLE t2 AS SELECT CAST(a AS BINARY(4)) AS cb4, @@ -798,7 +798,7 @@ t2 CREATE TABLE `t2` ( `cb32` binary(32) DEFAULT NULL, `cb530` varbinary(530) DEFAULT NULL, `cb65535` blob DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SELECT HEX(cb4), HEX(cb), @@ -887,7 +887,7 @@ Table Create Table t2 CREATE TABLE `t2` ( `MIN(a)` inet6 DEFAULT NULL, `MAX(a)` inet6 DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t2; SELECT AVG(a) FROM t1; ERROR HY000: Illegal parameter data type inet6 for operation 'avg(' @@ -953,7 +953,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `a` inet6 NOT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci EXECUTE IMMEDIATE 'INSERT INTO t1 VALUES (?)' USING '::1'; EXECUTE IMMEDIATE 'INSERT INTO t1 VALUES (?)' USING CAST('::2' AS INET6); EXECUTE IMMEDIATE 'INSERT INTO t1 VALUES (?)' USING 0x00000000000000000000000000000003; @@ -986,7 +986,7 @@ Table Create Table t2 CREATE TABLE `t2` ( `c1` varchar(39) DEFAULT NULL, `c2` varchar(39) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t2; CREATE TABLE t2 AS SELECT CONCAT(_utf8'1', a) AS c1, @@ -996,10 +996,10 @@ FROM t1; SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( - `c1` varchar(40) CHARACTER SET utf8mb3 DEFAULT NULL, - `c2` varchar(40) CHARACTER SET utf8mb3 DEFAULT NULL, - `c3` varchar(40) CHARACTER SET utf8mb3 DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 + `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 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t2; CREATE TABLE t2 AS SELECT CONCAT(_latin1'1', a) AS c1, @@ -1012,7 +1012,7 @@ t2 CREATE TABLE `t2` ( `c1` varchar(40) DEFAULT NULL, `c2` varchar(40) DEFAULT NULL, `c3` varchar(40) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t2; DROP TABLE t1; # @@ -1023,21 +1023,21 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c` inet6 NOT NULL DEFAULT '::' -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 AS SELECT CAST('::' AS INET6) AS c UNION SELECT '::1'; SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c` inet6 NOT NULL DEFAULT '::' -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 AS SELECT '::' AS c UNION SELECT CAST('::1' AS INET6); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c` inet6 NOT NULL DEFAULT '::' -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 AS SELECT CAST('::' AS INET6) AS c UNION SELECT 0x00000000000000000000000000000001; SELECT * FROM t1; @@ -2101,7 +2101,7 @@ Table Create Table t2 CREATE TABLE `t2` ( `ca` inet6 NOT NULL, `cb` inet6 DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t2; CREATE TABLE t2 AS SELECT COALESCE(a,a), COALESCE(a,b) FROM t1; SHOW CREATE TABLE t2; @@ -2109,7 +2109,7 @@ Table Create Table t2 CREATE TABLE `t2` ( `COALESCE(a,a)` inet6 NOT NULL, `COALESCE(a,b)` inet6 DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t2; CREATE TABLE t2 AS SELECT a AS ca,a AS cb FROM t1 UNION SELECT a,b FROM t1; SHOW CREATE TABLE t2; @@ -2117,7 +2117,7 @@ Table Create Table t2 CREATE TABLE `t2` ( `ca` inet6 NOT NULL DEFAULT '::', `cb` inet6 DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t2; DROP TABLE t1; # @@ -2141,7 +2141,7 @@ SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( `IFNULL(c, 'foo')` inet6 DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SELECT * FROM t2; IFNULL(c, 'foo') :: @@ -2152,7 +2152,7 @@ SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( `IFNULL(c, '::1')` inet6 NOT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SELECT * FROM t2; IFNULL(c, '::1') :: diff --git a/plugin/type_inet/mysql-test/type_inet/type_inet6_csv.result b/plugin/type_inet/mysql-test/type_inet/type_inet6_csv.result index 8e972235b06..a2d7cea03cc 100644 --- a/plugin/type_inet/mysql-test/type_inet/type_inet6_csv.result +++ b/plugin/type_inet/mysql-test/type_inet/type_inet6_csv.result @@ -10,7 +10,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `a` inet6 NOT NULL -) ENGINE=CSV DEFAULT CHARSET=latin1 +) ENGINE=CSV DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci FOR i IN 0..255 DO INSERT INTO t1 VALUES (CONCAT('::', HEX(i))); diff --git a/plugin/type_inet/mysql-test/type_inet/type_inet6_innodb.result b/plugin/type_inet/mysql-test/type_inet/type_inet6_innodb.result index a6911751747..deb1c718b49 100644 --- a/plugin/type_inet/mysql-test/type_inet/type_inet6_innodb.result +++ b/plugin/type_inet/mysql-test/type_inet/type_inet6_innodb.result @@ -14,7 +14,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` inet6 DEFAULT NULL, KEY `a` (`a`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci FOR i IN 0..255 DO INSERT INTO t1 VALUES (CONCAT('::', HEX(i))); diff --git a/plugin/type_inet/mysql-test/type_inet/type_inet6_memory.result b/plugin/type_inet/mysql-test/type_inet/type_inet6_memory.result index db4196366ca..e805b167136 100644 --- a/plugin/type_inet/mysql-test/type_inet/type_inet6_memory.result +++ b/plugin/type_inet/mysql-test/type_inet/type_inet6_memory.result @@ -14,7 +14,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` inet6 DEFAULT NULL, KEY `a` (`a`) -) ENGINE=MEMORY DEFAULT CHARSET=latin1 +) ENGINE=MEMORY DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci FOR i IN 0..255 DO INSERT INTO t1 VALUES (CONCAT('::', HEX(i))); diff --git a/plugin/type_inet/mysql-test/type_inet/type_inet6_mix_decimal.result b/plugin/type_inet/mysql-test/type_inet/type_inet6_mix_decimal.result index 230b19f5a42..2f715767686 100644 --- a/plugin/type_inet/mysql-test/type_inet/type_inet6_mix_decimal.result +++ b/plugin/type_inet/mysql-test/type_inet/type_inet6_mix_decimal.result @@ -29,7 +29,7 @@ t2 CREATE TABLE `t2` ( `target` inet6 DEFAULT '::', `source` decimal(38,0) DEFAULT 0, PRIMARY KEY (`id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci CREATE TABLE t3 LIKE t2; INSERT INTO t3 VALUES (1, @@ -201,7 +201,7 @@ t2 CREATE TABLE `t2` ( `target` decimal(38,0) DEFAULT 0, `source` inet6 DEFAULT '::', PRIMARY KEY (`id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci CREATE TABLE t3 LIKE t2; INSERT INTO t3 VALUES (1, diff --git a/plugin/type_inet/mysql-test/type_inet/type_inet6_mix_double.result b/plugin/type_inet/mysql-test/type_inet/type_inet6_mix_double.result index f677e768a7d..5a4d9021dff 100644 --- a/plugin/type_inet/mysql-test/type_inet/type_inet6_mix_double.result +++ b/plugin/type_inet/mysql-test/type_inet/type_inet6_mix_double.result @@ -29,7 +29,7 @@ t2 CREATE TABLE `t2` ( `target` inet6 DEFAULT '::', `source` double DEFAULT 0, PRIMARY KEY (`id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci CREATE TABLE t3 LIKE t2; INSERT INTO t3 VALUES (1, @@ -201,7 +201,7 @@ t2 CREATE TABLE `t2` ( `target` double DEFAULT 0, `source` inet6 DEFAULT '::', PRIMARY KEY (`id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci CREATE TABLE t3 LIKE t2; INSERT INTO t3 VALUES (1, diff --git a/plugin/type_inet/mysql-test/type_inet/type_inet6_mix_double_loose.result b/plugin/type_inet/mysql-test/type_inet/type_inet6_mix_double_loose.result index e624b95b980..261afd7ba32 100644 --- a/plugin/type_inet/mysql-test/type_inet/type_inet6_mix_double_loose.result +++ b/plugin/type_inet/mysql-test/type_inet/type_inet6_mix_double_loose.result @@ -30,7 +30,7 @@ t2 CREATE TABLE `t2` ( `target` inet6 DEFAULT '::', `source` double DEFAULT 0, PRIMARY KEY (`id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci CREATE TABLE t3 LIKE t2; INSERT INTO t3 VALUES (1, @@ -228,7 +228,7 @@ t2 CREATE TABLE `t2` ( `target` double DEFAULT 0, `source` inet6 DEFAULT '::', PRIMARY KEY (`id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci CREATE TABLE t3 LIKE t2; INSERT INTO t3 VALUES (1, diff --git a/plugin/type_inet/mysql-test/type_inet/type_inet6_mix_double_strict_ignore.result b/plugin/type_inet/mysql-test/type_inet/type_inet6_mix_double_strict_ignore.result index 9b76306d510..bd870d14505 100644 --- a/plugin/type_inet/mysql-test/type_inet/type_inet6_mix_double_strict_ignore.result +++ b/plugin/type_inet/mysql-test/type_inet/type_inet6_mix_double_strict_ignore.result @@ -30,7 +30,7 @@ t2 CREATE TABLE `t2` ( `target` inet6 DEFAULT '::', `source` double DEFAULT 0, PRIMARY KEY (`id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci CREATE TABLE t3 LIKE t2; INSERT IGNORE INTO t3 VALUES (1, @@ -225,7 +225,7 @@ t2 CREATE TABLE `t2` ( `target` double DEFAULT 0, `source` inet6 DEFAULT '::', PRIMARY KEY (`id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci CREATE TABLE t3 LIKE t2; INSERT IGNORE INTO t3 VALUES (1, diff --git a/plugin/type_inet/mysql-test/type_inet/type_inet6_mix_int.result b/plugin/type_inet/mysql-test/type_inet/type_inet6_mix_int.result index dd078efc38f..f8f818f3ce3 100644 --- a/plugin/type_inet/mysql-test/type_inet/type_inet6_mix_int.result +++ b/plugin/type_inet/mysql-test/type_inet/type_inet6_mix_int.result @@ -29,7 +29,7 @@ t2 CREATE TABLE `t2` ( `target` inet6 DEFAULT '::', `source` int(11) DEFAULT 0, PRIMARY KEY (`id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci CREATE TABLE t3 LIKE t2; INSERT INTO t3 VALUES (1, @@ -201,7 +201,7 @@ t2 CREATE TABLE `t2` ( `target` int(11) DEFAULT 0, `source` inet6 DEFAULT '::', PRIMARY KEY (`id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci CREATE TABLE t3 LIKE t2; INSERT INTO t3 VALUES (1, diff --git a/plugin/type_inet/mysql-test/type_inet/type_inet6_mix_json.result b/plugin/type_inet/mysql-test/type_inet/type_inet6_mix_json.result index 2b6603a51c3..32aab121427 100644 --- a/plugin/type_inet/mysql-test/type_inet/type_inet6_mix_json.result +++ b/plugin/type_inet/mysql-test/type_inet/type_inet6_mix_json.result @@ -25,7 +25,7 @@ t2 CREATE TABLE `t2` ( `COALESCE(a,c)` inet6 DEFAULT NULL, `LEAST(a,b)` inet6 DEFAULT NULL, `LEAST(a,c)` inet6 DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t2; SELECT * FROM t1 WHERE a=b; a b c diff --git a/plugin/type_inet/mysql-test/type_inet/type_inet6_mix_time.result b/plugin/type_inet/mysql-test/type_inet/type_inet6_mix_time.result index afdbd9e1999..d3280ffe3d2 100644 --- a/plugin/type_inet/mysql-test/type_inet/type_inet6_mix_time.result +++ b/plugin/type_inet/mysql-test/type_inet/type_inet6_mix_time.result @@ -29,7 +29,7 @@ t2 CREATE TABLE `t2` ( `target` inet6 DEFAULT '::', `source` time DEFAULT '00:00:00', PRIMARY KEY (`id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci CREATE TABLE t3 LIKE t2; INSERT INTO t3 VALUES (1, @@ -201,7 +201,7 @@ t2 CREATE TABLE `t2` ( `target` time DEFAULT '00:00:00', `source` inet6 DEFAULT '::', PRIMARY KEY (`id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci CREATE TABLE t3 LIKE t2; INSERT INTO t3 VALUES (1, diff --git a/plugin/type_inet/mysql-test/type_inet/type_inet6_mix_uint.result b/plugin/type_inet/mysql-test/type_inet/type_inet6_mix_uint.result index 88439222de2..f040b54ee34 100644 --- a/plugin/type_inet/mysql-test/type_inet/type_inet6_mix_uint.result +++ b/plugin/type_inet/mysql-test/type_inet/type_inet6_mix_uint.result @@ -29,7 +29,7 @@ t2 CREATE TABLE `t2` ( `target` inet6 DEFAULT '::', `source` int(10) unsigned DEFAULT 0, PRIMARY KEY (`id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci CREATE TABLE t3 LIKE t2; INSERT INTO t3 VALUES (1, @@ -201,7 +201,7 @@ t2 CREATE TABLE `t2` ( `target` int(10) unsigned DEFAULT 0, `source` inet6 DEFAULT '::', PRIMARY KEY (`id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci CREATE TABLE t3 LIKE t2; INSERT INTO t3 VALUES (1, diff --git a/plugin/type_inet/mysql-test/type_inet/type_inet6_myisam.result b/plugin/type_inet/mysql-test/type_inet/type_inet6_myisam.result index ba65d61cb08..c2577ef44df 100644 --- a/plugin/type_inet/mysql-test/type_inet/type_inet6_myisam.result +++ b/plugin/type_inet/mysql-test/type_inet/type_inet6_myisam.result @@ -14,7 +14,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` inet6 DEFAULT NULL, KEY `a` (`a`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci FOR i IN 0..255 DO INSERT INTO t1 VALUES (CONCAT('::', HEX(i))); diff --git a/plugin/type_test/mysql-test/type_test/type_test_double-debug.result b/plugin/type_test/mysql-test/type_test/type_test_double-debug.result index 975decca11e..3493fb827ba 100644 --- a/plugin/type_test/mysql-test/type_test/type_test_double-debug.result +++ b/plugin/type_test/mysql-test/type_test/type_test_double-debug.result @@ -13,7 +13,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `a` test_double DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci Warnings: Note 1105 DBUG: [0] name='a' type_info='test_double' DROP TABLE t1; diff --git a/plugin/type_test/mysql-test/type_test/type_test_double.result b/plugin/type_test/mysql-test/type_test/type_test_double.result index 19ebb6cde64..6241ff95b8a 100644 --- a/plugin/type_test/mysql-test/type_test/type_test_double.result +++ b/plugin/type_test/mysql-test/type_test/type_test_double.result @@ -28,49 +28,49 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `a` test_double DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a TEST_DOUBLE(4)); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `a` test_double(4,0) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a TEST_DOUBLE(10)); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `a` test_double(10,0) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a TEST_DOUBLE(20)); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `a` test_double(20,0) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a TEST_DOUBLE(4,2)); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `a` test_double(4,2) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a TEST_DOUBLE(10,5)); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `a` test_double(10,5) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a TEST_DOUBLE(20,10)); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `a` test_double(20,10) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SELECT CAST('100' AS TEST_DOUBLE) AS cast; Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr @@ -104,7 +104,7 @@ SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( `a` test_double DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t2; DROP TABLE t1; CREATE TABLE t1 (a TEST_DOUBLE); @@ -113,7 +113,7 @@ SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( `COALESCE(a,a)` test_double DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t2; DROP TABLE t1; CREATE TABLE t1 (a TEST_DOUBLE); @@ -122,7 +122,7 @@ SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( `LEAST(a,a)` test_double DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t2; DROP TABLE t1; CREATE TABLE t1 (a TEST_DOUBLE); @@ -139,7 +139,7 @@ Table Create Table t2 CREATE TABLE `t2` ( `MIN(a)` test_double DEFAULT NULL, `MAX(a)` test_double DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t2; DROP TABLE t1; CREATE TABLE t1 (id INT, a TEST_DOUBLE); @@ -159,7 +159,7 @@ t2 CREATE TABLE `t2` ( `id` int(11) DEFAULT NULL, `MIN(a)` test_double DEFAULT NULL, `MAX(a)` test_double DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t2; DROP TABLE t1; CREATE TABLE t1 (a TEST_DOUBLE); @@ -175,7 +175,7 @@ SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( `a` test_double DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t2; DROP TABLE t1; CREATE TABLE t1 (a TEST_DOUBLE); @@ -190,7 +190,7 @@ SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( `c1` test_double DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t2; DROP TABLE t1; CREATE TABLE t1 (a TEST_DOUBLE); @@ -199,7 +199,7 @@ SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( `a` test_double DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t2; DROP TABLE t1; # Testing CREATE..LIKE @@ -209,7 +209,7 @@ SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( `a` test_double DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t2; DROP TABLE t1; # Testing CREATE..SELECT @@ -219,7 +219,7 @@ SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( `a` test_double DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t2; DROP TABLE t1; # Testing ALTER @@ -234,7 +234,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SELECT * FROM t1; a 10 @@ -244,7 +244,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `a` test_double DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SELECT * FROM t1; a 10 @@ -321,7 +321,7 @@ t2 CREATE TABLE `t2` ( `c1` test_double DEFAULT NULL, `c2` test_double DEFAULT NULL, `c3` test_double DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SELECT * FROM t2 ORDER BY c1; c1 c2 c3 0 0 0 @@ -355,7 +355,7 @@ t2 CREATE TABLE `t2` ( `COALESCE(c,c_smallint)` test_double DEFAULT NULL, `COALESCE(c,c_mediumint)` test_double DEFAULT NULL, `COALESCE(c,c_bigint)` test_double DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t2; DROP TABLE t1; CREATE TABLE t1 ( @@ -410,7 +410,7 @@ t2 CREATE TABLE `t2` ( `c1` test_double DEFAULT NULL, `c2` test_double DEFAULT NULL, `c3` test_double DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SELECT * FROM t2 ORDER BY c1; c1 c2 c3 0 0 0 @@ -444,7 +444,7 @@ t2 CREATE TABLE `t2` ( `LEAST(c,c_smallint)` test_double DEFAULT NULL, `LEAST(c,c_mediumint)` test_double DEFAULT NULL, `LEAST(c,c_bigint)` test_double DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t2; DROP TABLE t1; CREATE TABLE t1 ( @@ -499,7 +499,7 @@ t2 CREATE TABLE `t2` ( `c1` test_double DEFAULT NULL, `c2` test_double DEFAULT NULL, `c3` test_double DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SELECT * FROM t2 ORDER BY c1; c1 c2 c3 1 1 1 @@ -533,7 +533,7 @@ t2 CREATE TABLE `t2` ( `c + c_smallint` test_double DEFAULT NULL, `c + c_mediumint` test_double DEFAULT NULL, `c + c_bigint` test_double DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t2; DROP TABLE t1; CREATE TABLE t1 ( @@ -588,7 +588,7 @@ t2 CREATE TABLE `t2` ( `c1` test_double DEFAULT NULL, `c2` test_double DEFAULT NULL, `c3` test_double DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SELECT * FROM t2 ORDER BY c1; c1 c2 c3 0 0 0 @@ -622,7 +622,7 @@ t2 CREATE TABLE `t2` ( `c - c_smallint` test_double DEFAULT NULL, `c - c_mediumint` test_double DEFAULT NULL, `c - c_bigint` test_double DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t2; DROP TABLE t1; CREATE TABLE t1 ( @@ -689,7 +689,7 @@ t2 CREATE TABLE `t2` ( `CAST(a AS TIME)` time DEFAULT NULL, `CAST(a AS DATETIME)` datetime DEFAULT NULL, `CAST(a AS DATE)` date DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SELECT * FROM t2; a 20000102 CAST(a AS CHAR) 20000102 diff --git a/plugin/type_test/mysql-test/type_test/type_test_int8-debug.result b/plugin/type_test/mysql-test/type_test/type_test_int8-debug.result index 952a63c8476..c4abda77423 100644 --- a/plugin/type_test/mysql-test/type_test/type_test_int8-debug.result +++ b/plugin/type_test/mysql-test/type_test/type_test_int8-debug.result @@ -13,7 +13,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `a` test_int8(20) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci Warnings: Note 1105 DBUG: [0] name='a' type_info='test_int8' DROP TABLE t1; diff --git a/plugin/type_test/mysql-test/type_test/type_test_int8.result b/plugin/type_test/mysql-test/type_test/type_test_int8.result index f18c990cf3b..75fcf1f2f5e 100644 --- a/plugin/type_test/mysql-test/type_test/type_test_int8.result +++ b/plugin/type_test/mysql-test/type_test/type_test_int8.result @@ -28,28 +28,28 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `a` test_int8(20) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a TEST_INT8(4)); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `a` test_int8(4) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a TEST_INT8(10)); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `a` test_int8(10) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a TEST_INT8(20)); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `a` test_int8(20) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SELECT CAST('100' AS TEST_INT8) AS cast; Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr @@ -83,7 +83,7 @@ SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( `a` test_int8(20) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t2; DROP TABLE t1; CREATE TABLE t1 (a TEST_INT8); @@ -92,7 +92,7 @@ SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( `COALESCE(a,a)` test_int8(20) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t2; DROP TABLE t1; CREATE TABLE t1 (a TEST_INT8); @@ -101,7 +101,7 @@ SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( `LEAST(a,a)` test_int8(20) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t2; DROP TABLE t1; CREATE TABLE t1 (a TEST_INT8); @@ -118,7 +118,7 @@ Table Create Table t2 CREATE TABLE `t2` ( `MIN(a)` test_int8(20) DEFAULT NULL, `MAX(a)` test_int8(20) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t2; DROP TABLE t1; CREATE TABLE t1 (id INT, a TEST_INT8); @@ -138,7 +138,7 @@ t2 CREATE TABLE `t2` ( `id` int(11) DEFAULT NULL, `MIN(a)` test_int8(20) DEFAULT NULL, `MAX(a)` test_int8(20) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t2; DROP TABLE t1; CREATE TABLE t1 (a TEST_INT8); @@ -154,7 +154,7 @@ SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( `a` test_int8(20) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t2; DROP TABLE t1; CREATE TABLE t1 (a TEST_INT8); @@ -169,7 +169,7 @@ SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( `c1` test_int8(20) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t2; DROP TABLE t1; CREATE TABLE t1 (a TEST_INT8); @@ -178,7 +178,7 @@ SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( `a` test_int8(20) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t2; DROP TABLE t1; # Testing CREATE..LIKE @@ -188,7 +188,7 @@ SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( `a` test_int8(20) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t2; DROP TABLE t1; # Testing CREATE..SELECT @@ -198,7 +198,7 @@ SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( `a` test_int8(20) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t2; DROP TABLE t1; # Testing ALTER @@ -213,7 +213,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SELECT * FROM t1; a 10 @@ -223,7 +223,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `a` test_int8(20) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SELECT * FROM t1; a 10 @@ -300,7 +300,7 @@ t2 CREATE TABLE `t2` ( `c1` test_int8(20) DEFAULT NULL, `c2` decimal(20,1) DEFAULT NULL, `c3` double DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SELECT * FROM t2 ORDER BY c1; c1 c2 c3 0 0.0 0 @@ -334,7 +334,7 @@ t2 CREATE TABLE `t2` ( `COALESCE(c,c_smallint)` test_int8(20) DEFAULT NULL, `COALESCE(c,c_mediumint)` test_int8(20) DEFAULT NULL, `COALESCE(c,c_bigint)` test_int8(20) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t2; DROP TABLE t1; CREATE TABLE t1 ( @@ -389,7 +389,7 @@ t2 CREATE TABLE `t2` ( `c1` test_int8(20) DEFAULT NULL, `c2` decimal(20,1) DEFAULT NULL, `c3` double DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SELECT * FROM t2 ORDER BY c1; c1 c2 c3 0 0.0 0 @@ -423,7 +423,7 @@ t2 CREATE TABLE `t2` ( `LEAST(c,c_smallint)` test_int8(20) DEFAULT NULL, `LEAST(c,c_mediumint)` test_int8(20) DEFAULT NULL, `LEAST(c,c_bigint)` test_int8(20) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t2; DROP TABLE t1; CREATE TABLE t1 ( @@ -478,7 +478,7 @@ t2 CREATE TABLE `t2` ( `c1` bigint(21) DEFAULT NULL, `c2` decimal(21,1) DEFAULT NULL, `c3` double DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SELECT * FROM t2 ORDER BY c1; c1 c2 c3 1 1.0 1 @@ -512,7 +512,7 @@ t2 CREATE TABLE `t2` ( `c + c_smallint` bigint(21) DEFAULT NULL, `c + c_mediumint` bigint(21) DEFAULT NULL, `c + c_bigint` bigint(21) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t2; DROP TABLE t1; CREATE TABLE t1 ( @@ -567,7 +567,7 @@ t2 CREATE TABLE `t2` ( `c1` bigint(21) DEFAULT NULL, `c2` decimal(21,1) DEFAULT NULL, `c3` double DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SELECT * FROM t2 ORDER BY c1; c1 c2 c3 0 0.0 0 @@ -601,7 +601,7 @@ t2 CREATE TABLE `t2` ( `c - c_smallint` bigint(21) DEFAULT NULL, `c - c_mediumint` bigint(21) DEFAULT NULL, `c - c_bigint` bigint(21) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t2; DROP TABLE t1; CREATE TABLE t1 ( @@ -668,7 +668,7 @@ t2 CREATE TABLE `t2` ( `CAST(a AS TIME)` time DEFAULT NULL, `CAST(a AS DATETIME)` datetime DEFAULT NULL, `CAST(a AS DATE)` date DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SELECT * FROM t2; a 20000102 CAST(a AS CHAR) 20000102 diff --git a/plugin/type_uuid/mysql-test/type_uuid/type_uuid-debug.result b/plugin/type_uuid/mysql-test/type_uuid/type_uuid-debug.result index 0416c39c6f9..fc0eaae2627 100644 --- a/plugin/type_uuid/mysql-test/type_uuid/type_uuid-debug.result +++ b/plugin/type_uuid/mysql-test/type_uuid/type_uuid-debug.result @@ -14,5 +14,5 @@ Table Create Table t1 CREATE TABLE `t1` ( `c01` uuid DEFAULT NULL, `c02` uuid DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; 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 d388cab45d7..ab30c262148 100644 --- a/plugin/type_uuid/mysql-test/type_uuid/type_uuid.result +++ b/plugin/type_uuid/mysql-test/type_uuid/type_uuid.result @@ -11,7 +11,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `a` uuid DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DESCRIBE t1; Field Type Null Key Default Extra a uuid YES NULL @@ -67,7 +67,7 @@ t1 CREATE TABLE `t1` ( `c3` uuid DEFAULT '00000000-0000-0000-0000-000000000000', `c4` uuid DEFAULT 'ffffffff-ffff-ffff-ffff-ffffffffffff', `c5` uuid DEFAULT cast(X'ffffffffffffffffffffffffffffffff' as uuid) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DESCRIBE t1; Field Type Null Key Default Extra c1 uuid YES 00000000-0000-0000-0000-000000000000 @@ -225,7 +225,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `CAST('00000000-0000-0000-0000-000000000000' AS UUID)` uuid NOT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; # # Text and binary formats, comparison operators @@ -1509,7 +1509,7 @@ t2 CREATE TABLE `t2` ( `COALESCE(c, c_text)` uuid DEFAULT NULL, `COALESCE(c, c_mediumtext)` uuid DEFAULT NULL, `COALESCE(c, c_longtext)` uuid DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t2; CREATE TABLE t2 AS SELECT LEAST(c, c_char), @@ -1528,7 +1528,7 @@ t2 CREATE TABLE `t2` ( `LEAST(c, c_text)` uuid DEFAULT NULL, `LEAST(c, c_mediumtext)` uuid DEFAULT NULL, `LEAST(c, c_longtext)` uuid DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t2; DROP TABLE t1; CREATE TABLE t1 (a UUID); @@ -1570,7 +1570,7 @@ t2 CREATE TABLE `t2` ( `COALESCE(a, '00000000-0000-0000-0000-000000000000')` uuid DEFAULT NULL, `LEAST(a,'00000000-0000-0000-0000-000000000000')` uuid DEFAULT NULL, `GREATEST(a,'00000000-0000-0000-0000-000000000000')` uuid DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t2; SELECT COALESCE(a, 0x00000000000000000000000000000000) FROM t1 ORDER BY a; COALESCE(a, 0x00000000000000000000000000000000) @@ -1606,7 +1606,7 @@ t2 CREATE TABLE `t2` ( `COALESCE(a, 0x00000000000000000000000000000000)` uuid DEFAULT NULL, `LEAST(a,0x00000000000000000000000000000000)` uuid DEFAULT NULL, `GREATEST(a,0x00000000000000000000000000000000)` uuid DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t2; SELECT COALESCE(a, 10) FROM t1; ERROR HY000: Illegal parameter data types uuid and int for operation 'coalesce' @@ -1831,7 +1831,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `a` varchar(36) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a UUID); INSERT INTO t1 VALUES ('ffffffff-ffff-ffff-ffff-ffffffffffff'); @@ -1854,7 +1854,7 @@ t2 CREATE TABLE `t2` ( `CAST(a AS CHAR(66000))` mediumtext DEFAULT NULL, `CAST(a AS CHAR(16777215))` mediumtext DEFAULT NULL, `CAST(a AS CHAR(16777216))` longtext DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SELECT * FROM t2; CAST(a AS CHAR) ffffffff-ffff-ffff-ffff-ffffffffffff CAST(a AS CHAR(36)) ffffffff-ffff-ffff-ffff-ffffffffffff @@ -1890,7 +1890,7 @@ t2 CREATE TABLE `t2` ( `cb66000` mediumblob DEFAULT NULL, `cb16777215` mediumblob DEFAULT NULL, `cb16777216` longblob DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t2; CREATE TABLE t2 AS SELECT CAST(a AS BINARY(4)) AS cb4, @@ -1909,7 +1909,7 @@ t2 CREATE TABLE `t2` ( `cb32` binary(32) DEFAULT NULL, `cb530` varbinary(530) DEFAULT NULL, `cb65535` blob DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SELECT HEX(cb4), HEX(cb), @@ -2021,7 +2021,7 @@ Table Create Table t2 CREATE TABLE `t2` ( `MIN(a)` uuid DEFAULT NULL, `MAX(a)` uuid DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SELECT * FROM t2; MIN(a) MAX(a) 00000000-0000-0000-0000-000000000000 00000000-0000-0000-0000-000000000002 @@ -2084,7 +2084,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `a` uuid NOT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci EXECUTE IMMEDIATE 'INSERT INTO t1 VALUES (?)' USING '00000000-0000-0000-0000-000000000001'; EXECUTE IMMEDIATE 'INSERT INTO t1 VALUES (?)' @@ -2123,7 +2123,7 @@ Table Create Table t2 CREATE TABLE `t2` ( `c1` varchar(36) DEFAULT NULL, `c2` varchar(36) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t2; CREATE TABLE t2 AS SELECT CONCAT(_utf8'1', LEFT(a,35)) AS c1, @@ -2133,10 +2133,10 @@ FROM t1; SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( - `c1` varchar(36) CHARACTER SET utf8mb3 DEFAULT NULL, - `c2` varchar(36) CHARACTER SET utf8mb3 DEFAULT NULL, - `c3` varchar(36) CHARACTER SET utf8mb3 DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 + `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 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t2; CREATE TABLE t2 AS SELECT CONCAT(_latin1'1', LEFT(a,35)) AS c1, @@ -2149,7 +2149,7 @@ t2 CREATE TABLE `t2` ( `c1` varchar(36) DEFAULT NULL, `c2` varchar(36) DEFAULT NULL, `c3` varchar(36) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t2; DROP TABLE t1; # @@ -2163,7 +2163,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c` uuid NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000' -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SELECT * FROM t1 ORDER BY c; c 00000000-0000-0000-0000-000000000000 @@ -2177,7 +2177,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c` uuid NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000' -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SELECT * FROM t1 ORDER BY c; c 00000000-0000-0000-0000-000000000000 @@ -2191,7 +2191,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c` uuid NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000' -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SELECT * FROM t1 ORDER BY c; c 00000000-0000-0000-0000-000000000000 @@ -2205,7 +2205,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c` uuid NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000' -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SELECT * FROM t1 ORDER BY c; c 00000000-0000-0000-0000-000000000000 diff --git a/plugin/type_uuid/mysql-test/type_uuid/type_uuid_csv.result b/plugin/type_uuid/mysql-test/type_uuid/type_uuid_csv.result index 1ad371ec561..d912244e691 100644 --- a/plugin/type_uuid/mysql-test/type_uuid/type_uuid_csv.result +++ b/plugin/type_uuid/mysql-test/type_uuid/type_uuid_csv.result @@ -10,7 +10,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `a` uuid NOT NULL -) ENGINE=CSV DEFAULT CHARSET=latin1 +) ENGINE=CSV DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci FOR i IN 0..255 DO INSERT INTO t1 VALUES (CONCAT(REPEAT(0x00,15), UNHEX(HEX(i)))); diff --git a/plugin/type_uuid/mysql-test/type_uuid/type_uuid_innodb.result b/plugin/type_uuid/mysql-test/type_uuid/type_uuid_innodb.result index f777723eefc..d769f1a1374 100644 --- a/plugin/type_uuid/mysql-test/type_uuid/type_uuid_innodb.result +++ b/plugin/type_uuid/mysql-test/type_uuid/type_uuid_innodb.result @@ -14,7 +14,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` uuid DEFAULT NULL, KEY `a` (`a`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci FOR i IN 0..255 DO INSERT INTO t1 VALUES (CONCAT(REPEAT(0x00, 15),CHAR(i USING BINARY))); @@ -121,7 +121,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` uuid DEFAULT NULL, KEY `a` (`a`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci BEGIN; FOR i IN 0..255 DO diff --git a/plugin/type_uuid/mysql-test/type_uuid/type_uuid_memory.result b/plugin/type_uuid/mysql-test/type_uuid/type_uuid_memory.result index 9d2c27a9e25..f2a1e27d0d0 100644 --- a/plugin/type_uuid/mysql-test/type_uuid/type_uuid_memory.result +++ b/plugin/type_uuid/mysql-test/type_uuid/type_uuid_memory.result @@ -14,7 +14,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` uuid DEFAULT NULL, KEY `a` (`a`) -) ENGINE=MEMORY DEFAULT CHARSET=latin1 +) ENGINE=MEMORY DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci FOR i IN 0..255 DO INSERT INTO t1 VALUES (CONCAT(REPEAT(0x00, 15),CHAR(i USING BINARY))); @@ -188,7 +188,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` uuid DEFAULT NULL, KEY `a` (`a`) -) ENGINE=MEMORY DEFAULT CHARSET=latin1 +) ENGINE=MEMORY DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci BEGIN; FOR i IN 0..255 DO diff --git a/plugin/type_uuid/mysql-test/type_uuid/type_uuid_mix_decimal.result b/plugin/type_uuid/mysql-test/type_uuid/type_uuid_mix_decimal.result index 4eae75fbfc3..65dcabda42d 100644 --- a/plugin/type_uuid/mysql-test/type_uuid/type_uuid_mix_decimal.result +++ b/plugin/type_uuid/mysql-test/type_uuid/type_uuid_mix_decimal.result @@ -29,7 +29,7 @@ t2 CREATE TABLE `t2` ( `target` uuid DEFAULT '00000000-0000-0000-0000-000000000000', `source` decimal(38,0) DEFAULT 0, PRIMARY KEY (`id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci CREATE TABLE t3 LIKE t2; INSERT INTO t3 VALUES (1, @@ -201,7 +201,7 @@ t2 CREATE TABLE `t2` ( `target` decimal(38,0) DEFAULT 0, `source` uuid DEFAULT '00000000-0000-0000-0000-000000000000', PRIMARY KEY (`id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci CREATE TABLE t3 LIKE t2; INSERT INTO t3 VALUES (1, diff --git a/plugin/type_uuid/mysql-test/type_uuid/type_uuid_mix_double.result b/plugin/type_uuid/mysql-test/type_uuid/type_uuid_mix_double.result index 60f1a1a09ae..ae19f916544 100644 --- a/plugin/type_uuid/mysql-test/type_uuid/type_uuid_mix_double.result +++ b/plugin/type_uuid/mysql-test/type_uuid/type_uuid_mix_double.result @@ -29,7 +29,7 @@ t2 CREATE TABLE `t2` ( `target` uuid DEFAULT '00000000-0000-0000-0000-000000000000', `source` double DEFAULT 0, PRIMARY KEY (`id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci CREATE TABLE t3 LIKE t2; INSERT INTO t3 VALUES (1, @@ -201,7 +201,7 @@ t2 CREATE TABLE `t2` ( `target` double DEFAULT 0, `source` uuid DEFAULT '00000000-0000-0000-0000-000000000000', PRIMARY KEY (`id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci CREATE TABLE t3 LIKE t2; INSERT INTO t3 VALUES (1, diff --git a/plugin/type_uuid/mysql-test/type_uuid/type_uuid_mix_int.result b/plugin/type_uuid/mysql-test/type_uuid/type_uuid_mix_int.result index cb3f4c282e3..c92584a8b1e 100644 --- a/plugin/type_uuid/mysql-test/type_uuid/type_uuid_mix_int.result +++ b/plugin/type_uuid/mysql-test/type_uuid/type_uuid_mix_int.result @@ -29,7 +29,7 @@ t2 CREATE TABLE `t2` ( `target` uuid DEFAULT '00000000-0000-0000-0000-000000000000', `source` int(11) DEFAULT 0, PRIMARY KEY (`id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci CREATE TABLE t3 LIKE t2; INSERT INTO t3 VALUES (1, @@ -201,7 +201,7 @@ t2 CREATE TABLE `t2` ( `target` int(11) DEFAULT 0, `source` uuid DEFAULT '00000000-0000-0000-0000-000000000000', PRIMARY KEY (`id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci CREATE TABLE t3 LIKE t2; INSERT INTO t3 VALUES (1, diff --git a/plugin/type_uuid/mysql-test/type_uuid/type_uuid_mix_time.result b/plugin/type_uuid/mysql-test/type_uuid/type_uuid_mix_time.result index c86d46085e9..a4feb55b577 100644 --- a/plugin/type_uuid/mysql-test/type_uuid/type_uuid_mix_time.result +++ b/plugin/type_uuid/mysql-test/type_uuid/type_uuid_mix_time.result @@ -29,7 +29,7 @@ t2 CREATE TABLE `t2` ( `target` uuid DEFAULT '00000000-0000-0000-0000-000000000000', `source` time DEFAULT '00:00:00', PRIMARY KEY (`id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci CREATE TABLE t3 LIKE t2; INSERT INTO t3 VALUES (1, @@ -201,7 +201,7 @@ t2 CREATE TABLE `t2` ( `target` time DEFAULT '00:00:00', `source` uuid DEFAULT '00000000-0000-0000-0000-000000000000', PRIMARY KEY (`id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci CREATE TABLE t3 LIKE t2; INSERT INTO t3 VALUES (1, diff --git a/plugin/type_uuid/mysql-test/type_uuid/type_uuid_mix_uint.result b/plugin/type_uuid/mysql-test/type_uuid/type_uuid_mix_uint.result index 5202cd83865..252704d57ef 100644 --- a/plugin/type_uuid/mysql-test/type_uuid/type_uuid_mix_uint.result +++ b/plugin/type_uuid/mysql-test/type_uuid/type_uuid_mix_uint.result @@ -29,7 +29,7 @@ t2 CREATE TABLE `t2` ( `target` uuid DEFAULT '00000000-0000-0000-0000-000000000000', `source` int(10) unsigned DEFAULT 0, PRIMARY KEY (`id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci CREATE TABLE t3 LIKE t2; INSERT INTO t3 VALUES (1, @@ -201,7 +201,7 @@ t2 CREATE TABLE `t2` ( `target` int(10) unsigned DEFAULT 0, `source` uuid DEFAULT '00000000-0000-0000-0000-000000000000', PRIMARY KEY (`id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci CREATE TABLE t3 LIKE t2; INSERT INTO t3 VALUES (1, diff --git a/plugin/type_uuid/mysql-test/type_uuid/type_uuid_myisam.result b/plugin/type_uuid/mysql-test/type_uuid/type_uuid_myisam.result index 35cc25abfd6..8df2c85ae48 100644 --- a/plugin/type_uuid/mysql-test/type_uuid/type_uuid_myisam.result +++ b/plugin/type_uuid/mysql-test/type_uuid/type_uuid_myisam.result @@ -14,7 +14,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` uuid DEFAULT NULL, KEY `a` (`a`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci FOR i IN 0..255 DO INSERT INTO t1 VALUES (CONCAT(REPEAT(0x00, 15),CHAR(i USING BINARY))); @@ -121,7 +121,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` uuid DEFAULT NULL, KEY `a` (`a`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci BEGIN; FOR i IN 0..255 DO @@ -205,7 +205,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` uuid DEFAULT NULL, KEY `a` (`a`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PackKey PACKED DROP TABLE t1; @@ -216,7 +216,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` uuid DEFAULT NULL, KEY `a` (`a`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PackKey PACKED DROP TABLE t1; @@ -227,7 +227,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` uuid DEFAULT NULL, KEY `a` (`a`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PackKey NOT PACKED DROP TABLE t1; diff --git a/plugin/user_variables/mysql-test/user_variables/basic.result b/plugin/user_variables/mysql-test/user_variables/basic.result index a47c9301c21..07f51ee5607 100644 --- a/plugin/user_variables/mysql-test/user_variables/basic.result +++ b/plugin/user_variables/mysql-test/user_variables/basic.result @@ -15,7 +15,7 @@ user_variables CREATE TEMPORARY TABLE `user_variables` ( `VARIABLE_VALUE` varchar(2048), `VARIABLE_TYPE` varchar(64) NOT NULL, `CHARACTER_SET_NAME` varchar(32) -) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 +) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci FLUSH USER_VARIABLES; SELECT COUNT(*) FROM INFORMATION_SCHEMA.USER_VARIABLES; COUNT(*) |