bk commit into 5.1 tree (monty:1.2207)

[monty]

Below is the list of changes that have just been committed into a local
5.1 repository of monty. When monty 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.2207 06/06/23 03:03:03 monty@stripped +2 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.1
  into  mysql.com:/home/my/mysql-5.1

  sql/sql_class.h
    1.302 06/06/23 03:02:58 monty@stripped +0 -0
    Auto merged

  sql/handler.cc
    1.244 06/06/23 03:02:58 monty@stripped +0 -0
    Auto merged

# 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:	monty
# Host:	narttu.mysql.fi
# Root:	/home/my/mysql-5.1/RESYNC

--- 1.243/sql/handler.cc	2006-06-22 14:27:42 +03:00
+++ 1.244/sql/handler.cc	2006-06-23 03:02:58 +03:00
@@ -3307,7 +3307,7 @@
                  const byte *before_record,
                  const byte *after_record)
   {
-    if (table->file->is_injective())
+    if (table->file->ha_table_flags() & HA_HAS_OWN_BINLOGGING)
       return 0;
     bool error= 0;
     THD *const thd= table->in_use;
@@ -3328,16 +3328,18 @@
       if (likely(!(error= bitmap_init(&cols,
                                       use_bitbuf ? bitbuf : NULL,
                                       (n_fields + 7) & ~7UL,
-                                      false))))
+                                      FALSE))))
       {
         bitmap_set_all(&cols);
         if (likely(!(error= write_locked_table_maps(thd))))
         {
           error=
             RowsEventT::binlog_row_logging_function(thd, table,
-                                                    table->file->has_transactions(),
+                                                    table->file->
+                                                    has_transactions(),
                                                     &cols, table->s->fields,
-                                                    before_record, after_record);
+                                                    before_record,
+                                                    after_record);
         }
         if (!use_bitbuf)
           bitmap_free(&cols);

--- 1.301/sql/sql_class.h	2006-06-22 12:20:19 +03:00
+++ 1.302/sql/sql_class.h	2006-06-23 03:02:58 +03:00
@@ -692,6 +692,14 @@
      THD::prelocked_mode for more info.)
   */
   MYSQL_LOCK *locked_tables;
+
+  /*
+    CREATE-SELECT keeps an extra lock for the table being
+    created. This field is used to keep the extra lock available for
+    lower level routines, which would otherwise miss that lock.
+   */
+  MYSQL_LOCK *extra_lock;
+
   /*
     prelocked_mode_type enum and prelocked_mode member are used for
     indicating whenever "prelocked mode" is on, and what type of
@@ -744,7 +752,7 @@
   void reset_open_tables_state()
   {
     open_tables= temporary_tables= handler_tables= derived_tables= 0;
-    lock= locked_tables= 0;
+    extra_lock= lock= locked_tables= 0;
     prelocked_mode= NON_PRELOCKED;
     state_flags= 0U;
   }
@@ -1595,9 +1603,6 @@
   bool send_eof();
   /* not implemented: select_insert is never re-used in prepared statements */
   void cleanup();
-
-protected:
-  MYSQL_LOCK *lock;
 };