Commit 9f465327 authored by unknown's avatar unknown
Browse files

merging


mysql-test/r/type_enum.result:
  test result fixed
parent 89d5a1a5
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -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,
  `f2` enum('') default NULL
  `f1` int(11) DEFAULT NULL,
  `f2` enum('') DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
drop table t1;