summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorunknown <tomas@poseidon.ndb.mysql.com>2006-06-30 16:26:33 +0200
committerunknown <tomas@poseidon.ndb.mysql.com>2006-06-30 16:26:33 +0200
commite410532ae1e262c2cb76c58e074d88da59b58ae1 (patch)
tree254dbf89a111d183b6336967208d06a0d7443aa7 /sql
parent0343a80b021fefc932bdb2bd2e46d33995e41cf0 (diff)
parent437afbfda8ece60baa898b14fe8c01b3c00d8f09 (diff)
downloadmariadb-git-e410532ae1e262c2cb76c58e074d88da59b58ae1.tar.gz
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main sql/ha_ndbcluster.cc: Auto merged
Diffstat (limited to 'sql')
-rw-r--r--sql/ha_ndbcluster.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc
index 1837b22cf42..10240e597bf 100644
--- a/sql/ha_ndbcluster.cc
+++ b/sql/ha_ndbcluster.cc
@@ -1364,6 +1364,12 @@ int ha_ndbcluster::unique_index_read(const byte *key,
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)
{