diff options
| author | msvensson@neptunus.(none) <> | 2006-03-06 11:39:36 +0100 |
|---|---|---|
| committer | msvensson@neptunus.(none) <> | 2006-03-06 11:39:36 +0100 |
| commit | 40b3222b74a503f694b81a5d9b5c09a7bbee68a6 (patch) | |
| tree | ebd1254d595b663b63a532cd1207e1e87802aa4c /mysql-test/r/case.result | |
| parent | b56857d152415b1e748c9555159ff906771706fa (diff) | |
| parent | c4b1fb68b435bab222fbfc3bb746a30bbca3b7c4 (diff) | |
| download | mariadb-git-40b3222b74a503f694b81a5d9b5c09a7bbee68a6.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/bug10460/my51-bug10460
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
Diffstat (limited to 'mysql-test/r/case.result')
| -rw-r--r-- | mysql-test/r/case.result | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/mysql-test/r/case.result b/mysql-test/r/case.result index 83b7995002d..d28c3af4e0b 100644 --- a/mysql-test/r/case.result +++ b/mysql-test/r/case.result @@ -99,18 +99,18 @@ CASE WHEN 1 THEN 0.1e1 else '1' END AS c12 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` varchar(1) character set latin1 collate latin1_danish_ci NOT NULL default '', - `c2` varchar(1) character set latin1 collate latin1_danish_ci NOT NULL default '', - `c3` varbinary(1) NOT NULL default '', - `c4` varbinary(1) NOT NULL default '', - `c5` varbinary(3) NOT NULL default '', - `c6` varbinary(3) NOT NULL default '', - `c7` decimal(2,1) NOT NULL default '0.0', - `c8` decimal(2,1) NOT NULL default '0.0', - `c9` decimal(2,1) default NULL, - `c10` double NOT NULL default '0', - `c11` double NOT NULL default '0', - `c12` varbinary(5) NOT NULL default '' + `c1` varchar(1) CHARACTER SET latin1 COLLATE latin1_danish_ci NOT NULL DEFAULT '', + `c2` varchar(1) CHARACTER SET latin1 COLLATE latin1_danish_ci NOT NULL DEFAULT '', + `c3` varbinary(1) NOT NULL DEFAULT '', + `c4` varbinary(1) NOT NULL DEFAULT '', + `c5` varbinary(3) NOT NULL DEFAULT '', + `c6` varbinary(3) NOT NULL DEFAULT '', + `c7` decimal(2,1) NOT NULL DEFAULT '0.0', + `c8` decimal(2,1) NOT NULL DEFAULT '0.0', + `c9` decimal(2,1) DEFAULT NULL, + `c10` double NOT NULL DEFAULT '0', + `c11` double NOT NULL DEFAULT '0', + `c12` varbinary(5) NOT NULL DEFAULT '' ) ENGINE=MyISAM DEFAULT CHARSET=latin1 DROP TABLE t1; SELECT CASE @@ -151,13 +151,13 @@ Note 1003 select coalesce(1) AS `COALESCE(1)`,coalesce(1.0) AS `COALESCE(1.0)`,c SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `COALESCE(1)` int(1) NOT NULL default '0', - `COALESCE(1.0)` decimal(2,1) unsigned NOT NULL default '0.0', - `COALESCE('a')` varchar(1) NOT NULL default '', - `COALESCE(1,1.0)` decimal(2,1) NOT NULL default '0.0', - `COALESCE(1,'1')` varbinary(1) NOT NULL default '', - `COALESCE(1.1,'1')` varbinary(3) NOT NULL default '', - `COALESCE('a' COLLATE latin1_bin,'b')` varchar(1) character set latin1 collate latin1_bin NOT NULL default '' + `COALESCE(1)` int(1) NOT NULL DEFAULT '0', + `COALESCE(1.0)` decimal(2,1) unsigned NOT NULL DEFAULT '0.0', + `COALESCE('a')` varchar(1) NOT NULL DEFAULT '', + `COALESCE(1,1.0)` decimal(2,1) NOT NULL DEFAULT '0.0', + `COALESCE(1,'1')` varbinary(1) NOT NULL DEFAULT '', + `COALESCE(1.1,'1')` varbinary(3) NOT NULL DEFAULT '', + `COALESCE('a' COLLATE latin1_bin,'b')` varchar(1) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL DEFAULT '' ) ENGINE=MyISAM DEFAULT CHARSET=latin1 DROP TABLE t1; SELECT 'case+union+test' |