mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-29 10:14:19 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

correction of merge

Browse source
This commit is contained in:
unknown 2006-05-15 20:29:50 +02:00
parent 84b8f11141
commit 326ebe4c5b
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sql/ha_ndbcluster.cc
View file

@ -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))