bk commit into 5.1 tree (frazer:1.2583)

[Frazer Clement]

Below is the list of changes that have just been committed into a local
5.1 repository of frazer.  When frazer 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, 2008-04-07 14:56:14+01:00, frazer@stripped +1 -0
  Merge fix

  sql/ha_ndbcluster.cc@stripped, 2008-04-07 14:56:06+01:00, frazer@stripped +6 -25
    Merge fix

diff -Nrup a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc
--- a/sql/ha_ndbcluster.cc	2008-04-07 13:33:40 +01:00
+++ b/sql/ha_ndbcluster.cc	2008-04-07 14:56:06 +01:00
@@ -2969,8 +2969,6 @@ int ha_ndbcluster::ndb_write_row(uchar *
   
   if (m_use_write)
   {
-    const NdbRecord *key_rec;
-    const uchar *key_row;
     uchar *mask;
 
 #ifdef HAVE_NDB_BINLOG
@@ -2988,36 +2986,19 @@ int ha_ndbcluster::ndb_write_row(uchar *
         otherwise (REPLACE INTO) -> do not use write_set.
     */
     if (thd->slave_thread)
-      user_cols_written_bitmap= table->write_set;
-    else
-#endif
-      user_cols_written_bitmap= NULL;
-
-    if (table_share->primary_key == MAX_KEY || m_user_defined_partitioning)
-    {
-      mask= copy_column_set(user_cols_written_bitmap);
-      if (m_user_defined_partitioning)
-        request_partition_function_value(mask);
-      if (table_share->primary_key == MAX_KEY)
-        request_hidden_key(mask);
-    }
-    else
-      mask= user_cols_written_bitmap ?
-        (uchar *)(user_cols_written_bitmap->bitmap) : NULL;
-
-    if (table_share->primary_key == MAX_KEY)
     {
-      key_rec= m_ndb_hidden_key_record;
-      key_row= &row[offset_hidden_key()];
+      user_cols_written_bitmap= table->write_set;
+      mask= (uchar *)(user_cols_written_bitmap->bitmap);
     }
     else
+#endif
     {
-      key_rec= m_index[table_share->primary_key].ndb_unique_record_row;
-      key_row= row;
+      user_cols_written_bitmap= NULL;
+      mask= NULL;
     }
 
     op= trans->writeTuple(key_rec, (const char *)key_row, m_ndb_record,
-                          (char *)record, (uchar *)(table->write_set->bitmap),
+                          (char *)record, mask,
                           poptions, sizeof(NdbOperation::OperationOptions));
   }
   else