after-merge fix.

9c67f70f · ramil/ram@mysql.com/ramil.myoffice.izhnet.ru · a4e6061a · 9c67f70f
Commit 9c67f70f authored Jun 04, 2007 by ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

mysql-test/r/innodb_mysql.result mysql-test/r/innodb_mysql.result +1 -1

No files found.
--- a/mysql-test/r/innodb_mysql.result
+++ b/mysql-test/r/innodb_mysql.result
@@ -626,7 +626,7 @@ alter table t1 comment '123';
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` int(11) default NULL
+  `a` int(11) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMMENT='123'
 drop table t1;
 End of 5.0 tests