summaryrefslogtreecommitdiff
path: root/mysql-test/r/case.result
diff options
context:
space:
mode:
authorunknown <bar@mysql.com>2005-01-18 22:12:33 +0400
committerunknown <bar@mysql.com>2005-01-18 22:12:33 +0400
commit764501e75211303707b311ce40ed42b2fb1ac5e2 (patch)
tree49cf2bebd11edcb257808a357ee591f67f47a457 /mysql-test/r/case.result
parentd4823d97b592b94b538b803a2d343d8fbb37831a (diff)
downloadmariadb-git-764501e75211303707b311ce40ed42b2fb1ac5e2.tar.gz
After-merge clean-up
Diffstat (limited to 'mysql-test/r/case.result')
-rw-r--r--mysql-test/r/case.result12
1 files changed, 6 insertions, 6 deletions
diff --git a/mysql-test/r/case.result b/mysql-test/r/case.result
index 5679b1d6838..1f2d60fb79a 100644
--- a/mysql-test/r/case.result
+++ b/mysql-test/r/case.result
@@ -98,10 +98,10 @@ 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` varchar(1) NOT NULL default '',
- `c4` varchar(1) NOT NULL default '',
- `c5` varchar(3) NOT NULL default '',
- `c6` varchar(3) 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` double(3,1) NOT NULL default '0.0',
`c8` double(3,1) NOT NULL default '0.0',
`c9` double(3,1) default NULL
@@ -149,8 +149,8 @@ t1 CREATE TABLE `t1` (
`COALESCE(1.0)` double(3,1) NOT NULL default '0.0',
`COALESCE('a')` varchar(1) NOT NULL default '',
`COALESCE(1,1.0)` double(3,1) NOT NULL default '0.0',
- `COALESCE(1,'1')` varchar(1) NOT NULL default '',
- `COALESCE(1.1,'1')` varchar(3) NOT NULL default '',
+ `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;