after merge fix

7c0930c4 · gluh@mysql.com/vva.(none) · f76aec6d · 7c0930c4 · 7c0930c4
Commit 7c0930c4 authored Jul 18, 2006 by gluh@mysql.com/vva.(none)
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

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

sql/handler.h sql/handler.h +0 -1

No files found.
--- a/mysql-test/r/strict.result
+++ b/mysql-test/r/strict.result
@@ -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;
--- a/sql/handler.h
+++ b/sql/handler.h
@@ -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;