diff options
Diffstat (limited to 'mysql-test/main/func_misc.result')
| -rw-r--r-- | mysql-test/main/func_misc.result | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/mysql-test/main/func_misc.result b/mysql-test/main/func_misc.result index de04c296912..f7a732d2afb 100644 --- a/mysql-test/main/func_misc.result +++ b/mysql-test/main/func_misc.result @@ -107,16 +107,16 @@ create table t1 as select uuid(), length(uuid()); show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `uuid()` varchar(36) CHARACTER SET utf8 DEFAULT NULL, + `uuid()` varchar(36) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL, `length(uuid())` int(10) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop table t1; create table t1 select INET_ATON('255.255.0.1') as `a`; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `a` bigint(21) unsigned DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop table t1; drop table if exists table_26093; drop function if exists func_26093_a; @@ -1524,7 +1524,7 @@ t1 CREATE TABLE `t1` ( `a1` varchar(30) DEFAULT inet_ntoa(`b`), `c` int(11) DEFAULT is_ipv4(`a`), `d` int(11) DEFAULT is_ipv6(`a`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci INSERT INTO t1 (a) VALUES ('192.168.001.001'),('::1'),('xxx'); SELECT * FROM t1; a b a1 c d @@ -1547,7 +1547,7 @@ t1 CREATE TABLE `t1` ( `str1` varchar(128) DEFAULT inet6_ntoa(`addr`), `b` int(11) DEFAULT is_ipv4_compat(`addr`), `c` int(11) DEFAULT is_ipv4_mapped(`addr`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci INSERT INTO t1 (str) VALUES ('::FFFF:192.168.0.1'),('::10.0.5.9'); SELECT str, str1, b,c FROM t1; str str1 b c @@ -1607,7 +1607,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `c1` bigint(20) unsigned NOT NULL, `c2` bigint(20) unsigned DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SELECT * FROM t1; c1 c2 18446744073709551615 18446744073709551615 |