diff options
Diffstat (limited to 'mysql-test/main/type_varchar_mysql41.result')
| -rw-r--r-- | mysql-test/main/type_varchar_mysql41.result | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/mysql-test/main/type_varchar_mysql41.result b/mysql-test/main/type_varchar_mysql41.result index 116e29a27c5..cc7f663d709 100644 --- a/mysql-test/main/type_varchar_mysql41.result +++ b/mysql-test/main/type_varchar_mysql41.result @@ -40,37 +40,37 @@ t1old CREATE TABLE `t1old` ( `c` char(3) DEFAULT NULL, `e` enum('abc','def','ghi') DEFAULT NULL, `t` text DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci CALL p1('v'); Table Create Table t2_simple CREATE TABLE `t2_simple` ( `v` varchar(30) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci Table Create Table t2_union_vv CREATE TABLE `t2_union_vv` ( `v` varchar(30) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci Table Create Table t2_union_vn CREATE TABLE `t2_union_vn` ( `v` varchar(30) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci Table Create Table t2_union_nv CREATE TABLE `t2_union_nv` ( `v` varchar(30) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci Table Create Table t2 CREATE TABLE `t2` ( `COALESCE(v)` varchar(30) DEFAULT NULL, `COALESCE(v,v)` varchar(30) DEFAULT NULL, `COALESCE(v,NULL)` varchar(30) DEFAULT NULL, `COALESCE(NULL,v)` varchar(30) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci Table Create Table t2 CREATE TABLE `t2` ( `LEAST(v,v)` varchar(30) DEFAULT NULL, `LEAST(v,NULL)` varchar(30) DEFAULT NULL, `LEAST(NULL,v)` varchar(30) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1old; TRUNCATE TABLE t1old; SHOW CREATE TABLE t1old; @@ -78,36 +78,36 @@ Table Create Table t1old CREATE TABLE `t1old` ( `a` varbinary(255)/*old*/ DEFAULT NULL, `b` varchar(255)/*old*/ DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci CALL p1('a'); Table Create Table t2_simple CREATE TABLE `t2_simple` ( `a` varbinary(255) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci Table Create Table t2_union_vv CREATE TABLE `t2_union_vv` ( `a` varbinary(255) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci Table Create Table t2_union_vn CREATE TABLE `t2_union_vn` ( `a` varbinary(255) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci Table Create Table t2_union_nv CREATE TABLE `t2_union_nv` ( `a` varbinary(255) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci Table Create Table t2 CREATE TABLE `t2` ( `COALESCE(a)` varbinary(255) DEFAULT NULL, `COALESCE(a,a)` varbinary(255) DEFAULT NULL, `COALESCE(a,NULL)` varbinary(255) DEFAULT NULL, `COALESCE(NULL,a)` varbinary(255) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci Table Create Table t2 CREATE TABLE `t2` ( `LEAST(a,a)` varbinary(255) DEFAULT NULL, `LEAST(a,NULL)` varbinary(255) DEFAULT NULL, `LEAST(NULL,a)` varbinary(255) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1old; DROP PROCEDURE p1; |