Skip to content

M
MariaDB
Commit a45c39e7 authored by unknown's avatar unknown
Browse files
Options

manual merge

parent 76d98963
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
sql/ha_ndbcluster.cc
View file @ a45c39e7
...@@ -2202,7 +2202,7 @@ int ha_ndbcluster::update_row(const byte *old_data, byte *new_data) ...@@ -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) ...@@ -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
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7