manual merge

This commit is contained in:
unknown 2006-02-10 17:59:53 +01:00
parent 76d98963c7
commit a45c39e732

View File

@ -2202,7 +2202,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
@ -2284,7 +2284,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