bk commit into 5.1 tree (lars:1.2209)

[Lars Thalmann]

Below is the list of changes that have just been committed into a local
5.1 repository of lthalmann. When lthalmann does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2209 06/06/16 02:52:17 lars@stripped +3 -0
  After merge fixes

  sql/sql_insert.cc
    1.202 06/06/16 02:52:05 lars@stripped +1 -1
    After merge fixes

  sql/sql_class.h
    1.299 06/06/16 02:52:05 lars@stripped +1 -4
    After merge fixes

  sql/handler.cc
    1.242 06/06/16 02:52:04 lars@stripped +2 -0
    After merge fixes

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	lars
# Host:	dl145k.mysql.com
# Root:	/users/lthalmann/bk/MERGE/mysql-5.1-merge

--- 1.241/sql/handler.cc	2006-06-16 01:15:07 +02:00
+++ 1.242/sql/handler.cc	2006-06-16 02:52:04 +02:00
@@ -53,6 +53,8 @@
 
 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 */

--- 1.298/sql/sql_class.h	2006-06-16 01:15:08 +02:00
+++ 1.299/sql/sql_class.h	2006-06-16 02:52:05 +02:00
@@ -1611,14 +1611,11 @@
 		 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();

--- 1.201/sql/sql_insert.cc	2006-06-16 01:15:08 +02:00
+++ 1.202/sql/sql_insert.cc	2006-06-16 02:52:05 +02:00
@@ -2772,7 +2772,7 @@
   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)