Commit 326ebe4c authored by unknown's avatar unknown

correction of merge

parent 84b8f111
...@@ -3517,7 +3517,7 @@ int ha_ndbcluster::external_lock(THD *thd, int lock_type) ...@@ -3517,7 +3517,7 @@ int ha_ndbcluster::external_lock(THD *thd, int lock_type)
const void *data, *pack_data; const void *data, *pack_data;
uint length, pack_length; uint length, pack_length;
if (readfrm(table->path, &data, &length) || if (readfrm(table->s->path, &data, &length) ||
packfrm(data, length, &pack_data, &pack_length) || packfrm(data, length, &pack_data, &pack_length) ||
pack_length != tab->getFrmLength() || pack_length != tab->getFrmLength() ||
memcmp(pack_data, tab->getFrmData(), pack_length)) memcmp(pack_data, tab->getFrmData(), pack_length))
......
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