after merge fix

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