diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-09-21 09:52:09 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-09-21 09:52:09 +0300 |
commit | 4345d9310080e6e4cbf1040263a2653f7d3d9227 (patch) | |
tree | 84b4f98615e1ec93d2bf12443e0de514783dd0db /plugin/type_inet/mysql-test/type_inet | |
parent | 90d899c30f4091e67989167806545e9a1d933355 (diff) | |
parent | 7c7ac6d4a4c77d4c302732da2efe6785b1f0e455 (diff) | |
download | mariadb-git-4345d9310080e6e4cbf1040263a2653f7d3d9227.tar.gz |
Merge 10.7 into 10.8
Diffstat (limited to 'plugin/type_inet/mysql-test/type_inet')
14 files changed, 47 insertions, 47 deletions
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))); |