diff options
Diffstat (limited to 'mysql-test/main/type_enum.result')
-rw-r--r-- | mysql-test/main/type_enum.result | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/mysql-test/main/type_enum.result b/mysql-test/main/type_enum.result index 58c723ac1eb..a98d1110bea 100644 --- a/mysql-test/main/type_enum.result +++ b/mysql-test/main/type_enum.result @@ -1627,14 +1627,14 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `a` enum('','a','b') NOT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop table t1; create table t1 (a enum (' ','a','b ') not null default 'b '); show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `a` enum('','a','b') NOT NULL DEFAULT 'b' -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop table t1; create table t1 (a enum ('0','1')); insert ignore into t1 set a='foobar'; @@ -1659,7 +1659,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `a` enum('','1','2') NOT NULL DEFAULT '' -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop table t1; set names latin1; CREATE TABLE t1 ( @@ -1671,7 +1671,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT 1, `b` enum('value','_value','') NOT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci show columns from t1; Field Type Null Key Default Extra a int(11) YES 1 @@ -1699,8 +1699,8 @@ a ENUM('','','') character set utf8 default '' show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` enum('','','') CHARACTER SET utf8 DEFAULT '' -) ENGINE=MyISAM DEFAULT CHARSET=latin1 + `a` enum('','','') CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT '' +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci insert into t1 values (''), (''), (''); select a from t1 order by a; a @@ -1718,7 +1718,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `a` enum('','','') DEFAULT '' -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci select a from t1 order by a; a @@ -1752,28 +1752,28 @@ Table Create Table t1 CREATE TABLE `t1` ( `f1` int(11) DEFAULT NULL, `f2` enum('') DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop table t1; create table t1(russian enum('E','F','EF','FE') NOT NULL DEFAULT'E'); show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `russian` enum('E','F','EF','FE') NOT NULL DEFAULT 'E' -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop table t1; create table t1(denormal enum('E','F','E,F','F,E') NOT NULL DEFAULT'E'); show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `denormal` enum('E','F','E,F','F,E') NOT NULL DEFAULT 'E' -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop table t1; create table t1(russian_deviant enum('E','F','EF','F,E') NOT NULL DEFAULT'E'); show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `russian_deviant` enum('E','F','EF','F,E') NOT NULL DEFAULT 'E' -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop table t1; create table t1(exhausting_charset enum('ABCDEFGHIJKLMNOPQRSTUVWXYZ','
!"','#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~','xx\','yy\','zz')); @@ -2291,7 +2291,7 @@ SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( `(SELECT a FROM t1)` varchar(1) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t2; # UNION + table column CREATE TABLE t2 AS SELECT (SELECT a FROM t1 UNION SELECT NULL); @@ -2299,7 +2299,7 @@ SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( `(SELECT a FROM t1 UNION SELECT NULL)` varchar(1) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t2; # UNION + SP variable CREATE PROCEDURE p1() @@ -2314,7 +2314,7 @@ CALL p1(); Table Create Table t2 CREATE TABLE `t2` ( `(SELECT va FROM t1 UNION SELECT NULL)` varchar(1) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP PROCEDURE p1; # UNION + anchored SP variable CREATE PROCEDURE p1() @@ -2329,6 +2329,6 @@ CALL p1(); Table Create Table t2 CREATE TABLE `t2` ( `(SELECT va FROM t1 UNION SELECT NULL)` varchar(1) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP PROCEDURE p1; DROP TABLE t1; |