diff options
| author | kent@mysql.com <> | 2006-05-18 00:42:07 +0200 |
|---|---|---|
| committer | kent@mysql.com <> | 2006-05-18 00:42:07 +0200 |
| commit | 4ab4c99eff759756b0aefc78ecb44199baba6b38 (patch) | |
| tree | db59398bf6aae6b588ff684a8153a79d5f9f42cf /mysql-test/r/case.result | |
| parent | 5842dcaa7daa5fa9b443f1720afdfffc63408781 (diff) | |
| download | mariadb-git-4ab4c99eff759756b0aefc78ecb44199baba6b38.tar.gz | |
type_newdecimal.result, case.result:
Adjusted merge
Diffstat (limited to 'mysql-test/r/case.result')
| -rw-r--r-- | mysql-test/r/case.result | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/r/case.result b/mysql-test/r/case.result index 49e96928599..1d2041432fe 100644 --- a/mysql-test/r/case.result +++ b/mysql-test/r/case.result @@ -103,8 +103,8 @@ t1 CREATE TABLE `t1` ( `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 '', + `c5` varbinary(4) NOT NULL DEFAULT '', + `c6` varbinary(4) 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, @@ -156,7 +156,7 @@ t1 CREATE TABLE `t1` ( `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(1.1,'1')` varbinary(4) 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; |