summaryrefslogtreecommitdiff
path: root/sql/ha_myisammrg.cc
diff options
context:
space:
mode:
authorunknown <monty@bitch.mysql.fi>2001-08-10 17:05:54 +0300
committerunknown <monty@bitch.mysql.fi>2001-08-10 17:05:54 +0300
commitbffebc8e0be4772e7988b6b23570bd1197c7214a (patch)
treed54f66790a3d6fbc6eb5c7145f39bba41960b0e1 /sql/ha_myisammrg.cc
parent9d5a520730a8136633f8aa81e5f3ede2a1412033 (diff)
downloadmariadb-git-bffebc8e0be4772e7988b6b23570bd1197c7214a.tar.gz
Fixed bug in ALTER TABLE for MERGE tables
Portability fixes Fixed problem when giving wrong arguments to myisam_recover Fix to remove warnings when using purify BUILD/compile-solaris-sparc-purify: Added innodb and berkeleydb to test mysql-test/install_test_db.sh: Portability fix. sql/ha_myisam.cc: Fixed problem when giving wrong arguments to myisam_recover sql/ha_myisammrg.cc: Fixed bug in ALTER TABLE for MERGE tables sql/sql_list.h: Fix to remove warnings when using purify sql/sql_select.cc: Fix to remove warnings from purify BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
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 b842c15cce0..866fd1e69f9 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;
}