diff options
author | unknown <tomas@poseidon.ndb.mysql.com> | 2006-05-15 20:29:50 +0200 |
---|---|---|
committer | unknown <tomas@poseidon.ndb.mysql.com> | 2006-05-15 20:29:50 +0200 |
commit | e235928810d403287dd08ca76460474e7c8d91e4 (patch) | |
tree | 62afe2c9b350605937f2765d216512806ef1bba3 | |
parent | ddcc961c8c4135b52f72002a01c5c69ca31201bb (diff) | |
download | mariadb-git-e235928810d403287dd08ca76460474e7c8d91e4.tar.gz |
correction of merge
-rw-r--r-- | sql/ha_ndbcluster.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc index 8baaf6d76b5..3d9bd2dbe0f 100644 --- a/sql/ha_ndbcluster.cc +++ b/sql/ha_ndbcluster.cc @@ -3517,7 +3517,7 @@ int ha_ndbcluster::external_lock(THD *thd, int lock_type) const void *data, *pack_data; uint length, pack_length; - if (readfrm(table->path, &data, &length) || + if (readfrm(table->s->path, &data, &length) || packfrm(data, length, &pack_data, &pack_length) || pack_length != tab->getFrmLength() || memcmp(pack_data, tab->getFrmData(), pack_length)) |