bk commit into 4.1 tree (mskold:1.2199)

[Martin Skold]

Below is the list of changes that have just been committed into a local
4.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
  1.2199 05/04/21 13:09:19 mskold@stripped +1 -0
  Fix for failing ps_7ndb.test, force write_row when batching inserts so that update of primary key is done before next value to insert

  sql/ha_ndbcluster.cc
    1.143 05/04/21 13:08:58 mskold@stripped +4 -1
    Fix for failing ps_7ndb.test, force write_row when batching inserts so that update of primary key is done before next value to insert

# 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:	blowfish.ndb.mysql.com
# Root:	/usr/local/home/marty/MySQL/mysql-4.1

--- 1.142/sql/ha_ndbcluster.cc	Tue Apr 19 11:20:55 2005
+++ 1.143/sql/ha_ndbcluster.cc	Thu Apr 21 13:08:58 2005
@@ -1894,6 +1894,7 @@
   m_bulk_insert_not_flushed= TRUE;
   if ((m_rows_to_insert == (ha_rows) 1) || 
       ((m_rows_inserted % m_bulk_insert_rows) == 0) ||
+      m_primary_key_update ||
       set_blob_value)
   {
     THD *thd= current_thd;
@@ -2018,17 +2019,19 @@
     if (delete_res)
     {
       DBUG_PRINT("info", ("delete failed"));
-      // Undo write_row(new_data)
       DBUG_RETURN(delete_res);
     }     
     // Insert new row
     DBUG_PRINT("info", ("delete succeded"));
+    m_primary_key_update= TRUE;
     insert_res= write_row(new_data);
+    m_primary_key_update= FALSE;
     if (insert_res)
     {
       DBUG_PRINT("info", ("insert failed"));
       if (trans->commitStatus() == NdbConnection::Started)
       {
+      // Undo write_row(new_data)
         m_primary_key_update= TRUE;
         insert_res= write_row((byte *)old_data);
         m_primary_key_update= FALSE;