From b6b23c1037ad7b0039408ca8caf847c037994df7 Mon Sep 17 00:00:00 2001
From: "lars@mysql.com" <>
Date: Fri, 16 Jun 2006 02:52:17 +0200
Subject: [PATCH] After merge fixes

---
 sql/handler.cc    | 2 ++
 sql/sql_class.h   | 5 +----
 sql/sql_insert.cc | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/sql/handler.cc b/sql/handler.cc
index ce96817695a..0895c6cf454 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -53,6 +53,8 @@ st_plugin_int *hton2plugin[MAX_HA];
 
 static handlerton *installed_htons[128];
 
+#define BITMAP_STACKBUF_SIZE (128/8)
+
 KEY_CREATE_INFO default_key_create_info= { HA_KEY_ALG_UNDEF, 0, {NullS,0} };
 
 /* static functions defined in this file */
diff --git a/sql/sql_class.h b/sql/sql_class.h
index 702c8fee671..866ee7b7a27 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -1611,14 +1611,11 @@ public:
 		 List<Item> &select_fields,enum_duplicates duplic, bool ignore)
     :select_insert (NULL, NULL, &select_fields, 0, 0, duplic, ignore),
     create_table(table), extra_fields(&fields_par),keys(&keys_par),
-    create_info(create_info_par),
-    lock(0)
+    create_info(create_info_par)
     {}
   int prepare(List<Item> &list, SELECT_LEX_UNIT *u);
 
-#ifdef HAVE_ROW_BASED_REPLICATION
   void binlog_show_create_table(TABLE **tables, uint count);
-#endif
   void store_values(List<Item> &values);
   void send_error(uint errcode,const char *err);
   bool send_eof();
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc
index 175d69de244..a6b4221f0a7 100644
--- a/sql/sql_insert.cc
+++ b/sql/sql_insert.cc
@@ -2772,7 +2772,7 @@ select_create::prepare(List<Item> &values, SELECT_LEX_UNIT *u)
   unit= u;
   if (!(table= create_table_from_items(thd, create_info, create_table,
                                        extra_fields, keys, &values, &lock,
-                                       &hook_ptr)))
+                                       hook_ptr)))
     DBUG_RETURN(-1);				// abort() deletes table
 
   if (table->s->fields < values.elements)