summaryrefslogtreecommitdiff
path: root/storage/myisammrg
diff options
context:
space:
mode:
authorSergey Vojtovich <svoj@sun.com>2009-12-09 15:03:34 +0400
committerSergey Vojtovich <svoj@sun.com>2009-12-09 15:03:34 +0400
commitcda5ad508ae591c3d73c5316eb68e024e5ebd7c4 (patch)
tree5732512e67d66255eba1c3b512ef545d714c9795 /storage/myisammrg
parent6fd3866c6c104f8bc991d71583e627ae6fabe0ab (diff)
parent6b8cd32eaa0e4bcbe2e5031cbb465f6a6036bc58 (diff)
downloadmariadb-git-cda5ad508ae591c3d73c5316eb68e024e5ebd7c4.tar.gz
Merge mysql-next-mr to mysql-next-mr-svoj.
Diffstat (limited to 'storage/myisammrg')
-rw-r--r--storage/myisammrg/ha_myisammrg.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/storage/myisammrg/ha_myisammrg.cc b/storage/myisammrg/ha_myisammrg.cc
index 275d778d868..49ea9626b21 100644
--- a/storage/myisammrg/ha_myisammrg.cc
+++ b/storage/myisammrg/ha_myisammrg.cc
@@ -1009,7 +1009,10 @@ int ha_myisammrg::extra_opt(enum ha_extra_function operation, ulong cache_size)
int ha_myisammrg::external_lock(THD *thd, int lock_type)
{
+ MYRG_TABLE *tmp;
DBUG_ASSERT(this->file->children_attached);
+ for (tmp= file->open_tables; tmp != file->end_table; tmp++)
+ tmp->table->in_use.data= thd;
return myrg_lock_database(file,lock_type);
}