merging

76bc3e2e · holyfoot/hf@mysql.com/deer.(none) · 06978991 · 76bc3e2e
Commit 76bc3e2e authored Oct 13, 2006 by holyfoot/hf@mysql.com/deer.(none)
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

mysql-test/r/type_enum.result mysql-test/r/type_enum.result +2 -2

No files found.
--- a/mysql-test/r/type_enum.result
+++ b/mysql-test/r/type_enum.result
@@ -1750,7 +1750,7 @@ alter table t1 add f2 enum(0xFFFF);
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `f1` int(11) default NULL,
+  `f1` int(11) DEFAULT NULL,
-  `f2` enum('') default NULL
+  `f2` enum('') DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;