bk commit into 5.1 tree (mskold:1.2433) BUG#26242

[Martin Skold]

Below is the list of changes that have just been committed into a local
5.1 repository of marty. When marty 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, 2007-02-27 14:14:45+01:00, mskold@stripped +2 -0
  Bug #26242  UPDATE with subquery and triggers failing with cluster tables: Set
will_batch to FALSE when batching is not possible

  sql/sql_delete.cc@stripped, 2007-02-27 14:13:48+01:00, mskold@stripped +1 -0
    Bug #26242  UPDATE with subquery and triggers failing with cluster tables: Set
will_batch to FALSE when batching is not possible

  sql/sql_update.cc@stripped, 2007-02-27 14:13:48+01:00, mskold@stripped +1 -0
    Bug #26242  UPDATE with subquery and triggers failing with cluster tables: Set
will_batch to FALSE when batching is not possible

# 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:	mskold
# Host:	linux.site
# Root:	/windows/Linux_space/MySQL/mysql-5.1

--- 1.209/sql/sql_delete.cc	2007-02-27 14:14:59 +01:00
+++ 1.210/sql/sql_delete.cc	2007-02-27 14:14:59 +01:00
@@ -229,6 +229,7 @@ bool mysql_delete(THD *thd, TABLE_LIST *
       to be done immediately, no batching is possible
     */
     (void) table->file->extra(HA_EXTRA_DELETE_CANNOT_BATCH);
+    will_batch= FALSE;
   }
 
   while (!(error=info.read_record(&info)) && !thd->killed &&

--- 1.223/sql/sql_update.cc	2007-02-27 14:14:59 +01:00
+++ 1.224/sql/sql_update.cc	2007-02-27 14:14:59 +01:00
@@ -467,6 +467,7 @@ int mysql_update(THD *thd,
       to be done immediately, no batching is possible
     */
     (void) table->file->extra(HA_EXTRA_UPDATE_CANNOT_BATCH);
+    will_batch= FALSE;
   }
   while (!(error=info.read_record(&info)) && !thd->killed)
   {