summaryrefslogtreecommitdiff
path: root/sql/ha_myisammrg.cc
diff options
context:
space:
mode:
authorsasha@mysql.sashanet.com <>2001-08-11 17:28:41 -0600
committersasha@mysql.sashanet.com <>2001-08-11 17:28:41 -0600
commit72671338869b105063ff6372799ee6c6c7679988 (patch)
tree68a7e089d65a9c4434527dfc1e58ba2f98a15a88 /sql/ha_myisammrg.cc
parent89ac8682ddc5f130a1ef50deb655c4d9bdbe3372 (diff)
parent5b7da4267e306af39aa0291a8e0d5685e9ed44cf (diff)
downloadmariadb-git-72671338869b105063ff6372799ee6c6c7679988.tar.gz
merged
Diffstat (limited to 'sql/ha_myisammrg.cc')
-rw-r--r--sql/ha_myisammrg.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/ha_myisammrg.cc b/sql/ha_myisammrg.cc
index e3e1d959438..ddfd48a0e71 100644
--- a/sql/ha_myisammrg.cc
+++ b/sql/ha_myisammrg.cc
@@ -229,6 +229,7 @@ void ha_myisammrg::update_create_info(HA_CREATE_INFO *create_info)
MYRG_TABLE *table;
THD *thd=current_thd;
create_info->merge_list.next= &create_info->merge_list.first;
+ create_info->merge_list.elements=0;
for (table=file->open_tables ; table != file->end_table ; table++)
{
@@ -240,6 +241,7 @@ void ha_myisammrg::update_create_info(HA_CREATE_INFO *create_info)
fn_format(buff,name,"","",3);
if (!(ptr->real_name=thd->strdup(buff)))
goto err;
+ create_info->merge_list.elements++;
(*create_info->merge_list.next) = (byte*) ptr;
create_info->merge_list.next= (byte**) &ptr->next;
}