diff options
| author | unknown <kent@mysql.com> | 2006-05-17 23:35:08 +0200 |
|---|---|---|
| committer | unknown <kent@mysql.com> | 2006-05-17 23:35:08 +0200 |
| commit | e78b4cca2570ae8116bd5cdba5742d7e32d44350 (patch) | |
| tree | b445582aaece08ed7bc0175eeb09cd1ebdd6db1c /mysql-test/r/case.result | |
| parent | 8df5fdb9334ff4c908471d5a6bd76dee57e3e9db (diff) | |
| parent | fe3ac3007a3766be7e826724b6bc3cf59b9930d0 (diff) | |
| download | mariadb-git-e78b4cca2570ae8116bd5cdba5742d7e32d44350.tar.gz | |
Merge mysql.com:/data0/mysqldev/my/tmp_merge
into mysql.com:/tmp/mysql-5.1-new
mysql-test/r/ps_7ndb.result:
Auto merged
mysql-test/r/type_float.result:
Auto merged
sql/item.cc:
Auto merged
Diffstat (limited to 'mysql-test/r/case.result')
| -rw-r--r-- | mysql-test/r/case.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/case.result b/mysql-test/r/case.result index 9d2706f64fa..49e96928599 100644 --- a/mysql-test/r/case.result +++ b/mysql-test/r/case.result @@ -152,7 +152,7 @@ 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(1.0)` decimal(2,1) 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 '', |