bk commit into 5.1 tree (tomas:1.2787)

[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-12-13 11:29:30+01:00, tomas@stripped +1 -0
  correct bulk update/delete to allow for batching

  sql/ha_ndbcluster.cc@stripped, 2007-12-13 11:29:27+01:00, tomas@stripped +2 -0
    correct bulk update/delete to allow for batching

diff -Nrup a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc
--- a/sql/ha_ndbcluster.cc	2007-12-13 11:28:09 +01:00
+++ b/sql/ha_ndbcluster.cc	2007-12-13 11:29:27 +01:00
@@ -4040,6 +4040,7 @@ int ha_ndbcluster::exec_bulk_update(uint
   DBUG_ENTER("ha_ndbcluster::exec_bulk_update");
   *dup_key_found= 0;
   if (m_thd_ndb->m_unsent_bytes &&
+      !(table->in_use->options & OPTION_ALLOW_BATCH) &&
       (!m_thd_ndb->m_handler ||
        m_blobs_pending))
   {
@@ -4364,6 +4365,7 @@ int ha_ndbcluster::end_bulk_delete()
 {
   DBUG_ENTER("end_bulk_delete");
   if (m_thd_ndb->m_unsent_bytes &&
+      !(table->in_use->options & OPTION_ALLOW_BATCH) &&
       !m_thd_ndb->m_handler)
   {
     uint ignore_count= 0;