Commit 3e97cc95 authored by unknown's avatar unknown

Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new


sql/ha_ndbcluster.cc:
  Auto merged
parents 36bfd749 a45c39e7
...@@ -2552,7 +2552,7 @@ int ha_ndbcluster::update_row(const byte *old_data, byte *new_data) ...@@ -2552,7 +2552,7 @@ int ha_ndbcluster::update_row(const byte *old_data, byte *new_data)
// read into m_ref // read into m_ref
DBUG_DUMP("key", m_ref, NDB_HIDDEN_PRIMARY_KEY_LENGTH); DBUG_DUMP("key", m_ref, NDB_HIDDEN_PRIMARY_KEY_LENGTH);
if (set_hidden_key(op, table->fields, m_ref)) if (set_hidden_key(op, table->s->fields, m_ref))
ERR_RETURN(op->getNdbError()); ERR_RETURN(op->getNdbError());
} }
else else
...@@ -2660,7 +2660,7 @@ int ha_ndbcluster::delete_row(const byte *record) ...@@ -2660,7 +2660,7 @@ int ha_ndbcluster::delete_row(const byte *record)
// This table has no primary key, use "hidden" primary key // This table has no primary key, use "hidden" primary key
DBUG_PRINT("info", ("Using hidden key")); DBUG_PRINT("info", ("Using hidden key"));
if (set_hidden_key(op, table->fields, m_ref)) if (set_hidden_key(op, table->s->fields, m_ref))
ERR_RETURN(op->getNdbError()); ERR_RETURN(op->getNdbError());
} }
else else
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment