mirror of
https://github.com/MariaDB/server.git
synced 2026-05-15 03:17:20 +02:00
manual merge
This commit is contained in:
parent
76d98963c7
commit
a45c39e732
1 changed files with 2 additions and 2 deletions
|
|
@ -2202,7 +2202,7 @@ int ha_ndbcluster::update_row(const byte *old_data, byte *new_data)
|
|||
// read into m_ref
|
||||
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());
|
||||
}
|
||||
else
|
||||
|
|
@ -2284,7 +2284,7 @@ int ha_ndbcluster::delete_row(const byte *record)
|
|||
// This table has no primary key, use "hidden" primary 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());
|
||||
}
|
||||
else
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue