Commit 410a2621 authored by unknown's avatar unknown
Browse files

after merge fix

parent 7f70e111

mysql-test/r/strict.result

+1 −1
Original line number Diff line number Diff line
@@ -1341,6 +1341,6 @@ comment '123456789*123456789*123456789*123456789*123456789*123456789*'; 
show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `i` int(11) default NULL

  `i` int(11) DEFAULT NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1 COMMENT='123456789*123456789*123456789*123456789*123456789*123456789*'

drop table t1;

sql/handler.h

+0 −1
Original line number Diff line number Diff line
@@ -727,7 +727,6 @@ typedef struct st_ha_create_information 
  LEX_STRING connect_string;

  const char *password, *tablespace;

  LEX_STRING comment;

  const char *password;

  const char *data_file_name, *index_file_name;

  const char *alias;

  ulonglong max_rows,min_rows;