bk commit into 5.1 tree (guilhem:1.2242)

[guilhem]

Below is the list of changes that have just been committed into a local
5.1 repository of guilhem. When guilhem 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@stripped, 2006-07-09 17:55:40+02:00, guilhem@stripped +1 -0
  Merge gbichot@stripped:/home/bk/mysql-5.1-rpl
  into  gbichot3.local:/home/mysql_src/mysql-5.1-new-WL3146-handler
  MERGE: 1.2231.1.4

  sql/sql_insert.cc@stripped, 2006-07-09 17:55:37+02:00, guilhem@stripped +0 -0
    Auto merged
    MERGE: 1.207.1.3

# 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:	guilhem
# Host:	gbichot3.local
# Root:	/home/mysql_src/mysql-5.1-new-WL3146-handler/RESYNC

--- 1.209/sql/sql_insert.cc	2006-07-09 17:55:45 +02:00
+++ 1.210/sql/sql_insert.cc	2006-07-09 17:55:45 +02:00
@@ -1293,6 +1293,11 @@
     thd.command=COM_DELAYED_INSERT;
     thd.lex->current_select= 0; 		// for my_message_sql
     thd.lex->sql_command= SQLCOM_INSERT;        // For innodb::store_lock()
+    /*
+      Statement-based replication of INSERT DELAYED has problems with RAND()
+      and user vars, so in mixed mode we go to row-based.
+    */
+    thd.set_current_stmt_binlog_row_based_if_mixed();
 
     bzero((char*) &thd.net, sizeof(thd.net));		// Safety
     bzero((char*) &table_list, sizeof(table_list));	// Safety
@@ -2751,7 +2756,8 @@
   MY_HOOKS(select_create *x) : ptr(x) { }
   virtual void do_prelock(TABLE **tables, uint count)
   {
-    if (ptr->get_thd()->current_stmt_binlog_row_based)
+    if (ptr->get_thd()->current_stmt_binlog_row_based  &&
+        !(ptr->get_create_info()->options & HA_LEX_CREATE_TMP_TABLE))
       ptr->binlog_show_create_table(tables, count);
   }