summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgluh@mysql.com/eagle.(none) <>2007-10-29 15:49:56 +0400
committergluh@mysql.com/eagle.(none) <>2007-10-29 15:49:56 +0400
commit69ed192e7277556f4e2ca487967322be7fe7edf7 (patch)
tree2cadbb97ca7e78c488b3ad46ce72ce8c35a3274c
parent61bdbf8a90f077d312adb056028a6b38d28e4087 (diff)
downloadmariadb-git-69ed192e7277556f4e2ca487967322be7fe7edf7.tar.gz
after merge fix
-rw-r--r--mysql-test/r/type_decimal.result4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/type_decimal.result b/mysql-test/r/type_decimal.result
index 4e9dcf41256..e37a398d22e 100644
--- a/mysql-test/r/type_decimal.result
+++ b/mysql-test/r/type_decimal.result
@@ -881,8 +881,8 @@ Note 1265 Data truncated for column 'a' at row 2
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
- `a` decimal(10,0) default NULL,
- `b` int(11) default NULL
+ `a` decimal(10,0) DEFAULT NULL,
+ `b` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
select round(a,b) as c from t1 order by c;
c