bk commit into 5.1 tree (tomas:1.2555)

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas 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-04-05 11:21:25+02:00, tomas@stripped +10 -0
  Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
  into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
  MERGE: 1.1810.2374.113

  include/my_base.h@stripped, 2007-04-05 11:17:46+02:00, tomas@stripped +0 -0
    Auto merged
    MERGE: 1.70.1.13

  sql/ha_ndbcluster.cc@stripped, 2007-04-05 11:21:23+02:00, tomas@stripped +2 -4
    manual merge
    MERGE: 1.175.1.132

  sql/ha_ndbcluster.h@stripped, 2007-04-05 11:17:46+02:00, tomas@stripped +0 -0
    Auto merged
    MERGE: 1.82.4.14

  sql/item_func.cc@stripped, 2007-04-05 11:17:46+02:00, tomas@stripped +0 -0
    Auto merged
    MERGE: 1.270.1.62

  sql/mysql_priv.h@stripped, 2007-04-05 11:17:46+02:00, tomas@stripped +0 -0
    Auto merged
    MERGE: 1.290.1.151

  sql/sql_delete.cc@stripped, 2007-04-05 11:17:46+02:00, tomas@stripped +0 -0
    Auto merged
    MERGE: 1.144.1.51

  sql/sql_insert.cc@stripped, 2007-04-05 11:17:46+02:00, tomas@stripped +0 -0
    Auto merged
    MERGE: 1.146.1.83

  sql/sql_load.cc@stripped, 2007-04-05 11:17:46+02:00, tomas@stripped +0 -0
    Auto merged
    MERGE: 1.78.1.33

  sql/sql_trigger.h@stripped, 2007-04-05 11:17:46+02:00, tomas@stripped +0 -0
    Auto merged
    MERGE: 1.19.1.8

  sql/sql_update.cc@stripped, 2007-04-05 11:17:46+02:00, tomas@stripped +0 -0
    Auto merged
    MERGE: 1.154.2.59

# 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:	tomas
# Host:	whalegate.ndb.mysql.com
# Root:	/home/tomas/mysql-5.1-single-user/RESYNC

--- 1.438/sql/ha_ndbcluster.cc	2007-04-05 10:22:42 +02:00
+++ 1.439/sql/ha_ndbcluster.cc	2007-04-05 11:21:23 +02:00
@@ -3926,8 +3926,6 @@
 int ha_ndbcluster::reset()
 {
   DBUG_ENTER("ha_ndbcluster::reset");
-  m_delete_cannot_batch= FALSE;
-  m_update_cannot_batch= FALSE;
   cond_clear();
   /*
     Regular partition pruning will set the bitmap appropriately.
@@ -3941,6 +3939,8 @@
   m_ignore_dup_key= FALSE;
   m_use_write= FALSE;
   m_ignore_no_key= FALSE;
+  m_delete_cannot_batch= FALSE;
+  m_update_cannot_batch= FALSE;
 
   DBUG_RETURN(0);
 }