summaryrefslogtreecommitdiff
path: root/sql/ha_ndbcluster.cc
diff options
context:
space:
mode:
authorunknown <tomas@poseidon.ndb.mysql.com>2006-02-10 17:59:53 +0100
committerunknown <tomas@poseidon.ndb.mysql.com>2006-02-10 17:59:53 +0100
commita45c39e732a36c4482ba98d1da30dcdcd66332f4 (patch)
tree54fdeabcd04879de9f304171e0f6b600db8234ea /sql/ha_ndbcluster.cc
parent76d98963c71e36ff60ed8e0556aae3c64cadac7d (diff)
downloadmariadb-git-a45c39e732a36c4482ba98d1da30dcdcd66332f4.tar.gz
manual merge
Diffstat (limited to 'sql/ha_ndbcluster.cc')
-rw-r--r--sql/ha_ndbcluster.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc
index 44dd6b5aa52..eb2cd5eb335 100644
--- a/sql/ha_ndbcluster.cc
+++ b/sql/ha_ndbcluster.cc
@@ -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