From f97b8e48b8f6ec290f7cc7ca3fe59c33f7cb0d9e Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 29 Oct 2007 15:49:56 +0400 Subject: [PATCH] after merge fix --- mysql-test/r/type_decimal.result | 4 ++-- 1 file 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