bk commit into 4.1 tree (tomas:1.2513)

[tomas]

Below is the list of changes that have just been committed into a local
4.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
  1.2513 06/06/30 16:25:07 tomas@stripped +1 -0
  adopted ndb handler code for tables without primary key and with unique index
  - added missing retrieval of hidden primary key

  sql/ha_ndbcluster.cc
    1.189 06/06/30 16:25:03 tomas@stripped +6 -0
    adopted ndb handler code for tables without primary key and with unique index
    - added missing retrieval of hidden primary key

# 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:	poseidon.ndb.mysql.com
# Root:	/home/tomas/mysql-4.1

--- 1.188/sql/ha_ndbcluster.cc	2006-06-29 20:55:14 +02:00
+++ 1.189/sql/ha_ndbcluster.cc	2006-06-30 16:25:03 +02:00
@@ -1364,6 +1364,12 @@
       m_value[i].ptr= NULL;
     }
   }
+  if (table->primary_key == MAX_KEY) 
+  {
+    DBUG_PRINT("info", ("Getting hidden key"));
+    if (get_ndb_value(op, NULL, i, NULL))
+      ERR_RETURN(op->getNdbError());
+  }
 
   if (execute_no_commit_ie(this,trans) != 0) 
   {