bk commit into 5.1 tree (tomas:1.2667) BUG#31787

[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-10-23 15:04:58+02:00, tomas@stripped +1 -0
  Bug #31787 slave does not batch updates
  - correction, pk_update never reaches this part of the code

  sql/ha_ndbcluster.cc@stripped, 2007-10-23 15:04:55+02:00, tomas@stripped +3
-10
    Bug #31787 slave does not batch updates
    - correction, pk_update never reaches this part of the code

diff -Nrup a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc
--- a/sql/ha_ndbcluster.cc	2007-10-23 14:42:16 +02:00
+++ b/sql/ha_ndbcluster.cc	2007-10-23 15:04:55 +02:00
@@ -4075,8 +4075,9 @@ int ha_ndbcluster::update_row(const ucha
     Batch update operation if we are doing a scan for update, unless
     there exist UPDATE AFTER triggers
   */
+  DBUG_ASSERT(!pk_update);
   if (!m_update_cannot_batch &&
-      (cursor || ((thd->options & OPTION_ALLOW_BATCH) && have_pk
&& !pk_update)))
+      (cursor || ((thd->options & OPTION_ALLOW_BATCH) && have_pk)))
   {
     /* For a scan, we only need to execute() if the batch buffer is full. */
     row= batch_copy_row_to_buffer(thd_ndb, new_data, need_execute);
@@ -4129,15 +4130,7 @@ int ha_ndbcluster::update_row(const ucha
     if (have_pk)
     {
       key_rec= m_index[table_share->primary_key].ndb_unique_record_row;
-      if (!pk_update)
-      {
-        key_row= row;
-      }
-      else
-      {
-        DBUG_ASSERT(need_execute);
-        key_row= old_data;
-      }
+      key_row= row;
     }
     else
     {