diff options
| author | monty@mysql.com <> | 2004-12-07 15:47:00 +0200 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-12-07 15:47:00 +0200 |
| commit | 563500994a31c2239a7d87ba9c5ea889493e3596 (patch) | |
| tree | b1c918186908fb490aa860c35dc9e2154aa633c8 /mysql-test/r/case.result | |
| parent | 77207d19f20f21c54b8d5279c6924f4c4bdaaa51 (diff) | |
| download | mariadb-git-563500994a31c2239a7d87ba9c5ea889493e3596.tar.gz | |
Update results for new varchar handling
Fixed compiler warnings
String results in CREATE ... SELECT are now created as CHAR(0), VARCHAR(X) or TEXT() depending on item->max_length
Diffstat (limited to 'mysql-test/r/case.result')
| -rw-r--r-- | mysql-test/r/case.result | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/mysql-test/r/case.result b/mysql-test/r/case.result index 75d0c9a7e3b..5679b1d6838 100644 --- a/mysql-test/r/case.result +++ b/mysql-test/r/case.result @@ -96,12 +96,12 @@ CASE WHEN 1 THEN 1.0 END AS c9 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` char(1) character set latin1 collate latin1_danish_ci NOT NULL default '', - `c2` char(1) character set latin1 collate latin1_danish_ci NOT NULL default '', - `c3` char(1) NOT NULL default '', - `c4` char(1) NOT NULL default '', - `c5` char(3) NOT NULL default '', - `c6` char(3) 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` varchar(1) NOT NULL default '', + `c4` varchar(1) NOT NULL default '', + `c5` varchar(3) NOT NULL default '', + `c6` varchar(3) NOT NULL default '', `c7` double(3,1) NOT NULL default '0.0', `c8` double(3,1) NOT NULL default '0.0', `c9` double(3,1) default NULL @@ -147,10 +147,10 @@ Table Create Table t1 CREATE TABLE `t1` ( `COALESCE(1)` int(1) NOT NULL default '0', `COALESCE(1.0)` double(3,1) NOT NULL default '0.0', - `COALESCE('a')` char(1) NOT NULL default '', + `COALESCE('a')` varchar(1) NOT NULL default '', `COALESCE(1,1.0)` double(3,1) NOT NULL default '0.0', - `COALESCE(1,'1')` char(1) NOT NULL default '', - `COALESCE(1.1,'1')` char(3) NOT NULL default '', - `COALESCE('a' COLLATE latin1_bin,'b')` char(1) character set latin1 collate latin1_bin NOT NULL default '' + `COALESCE(1,'1')` varchar(1) NOT NULL default '', + `COALESCE(1.1,'1')` varchar(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; |