From 7c0930c4ae2fd0d78d5b874c3dcb3d6cadf97a64 Mon Sep 17 00:00:00 2001
From: "gluh@mysql.com/vva.(none)" <>
Date: Tue, 18 Jul 2006 20:13:13 +0500
Subject: [PATCH] after merge fix

---
 mysql-test/r/strict.result | 2 +-
 sql/handler.h              | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/mysql-test/r/strict.result b/mysql-test/r/strict.result
index 169b885fa3d..dd96dc6d983 100644
--- 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;
diff --git a/sql/handler.h b/sql/handler.h
index 0b55eebd21a..b4572d449e5 100644
--- 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;