summaryrefslogtreecommitdiff
path: root/merge
diff options
context:
space:
mode:
authorunknown <monty@donna.mysql.com>2001-01-28 21:35:50 +0200
committerunknown <monty@donna.mysql.com>2001-01-28 21:35:50 +0200
commit184e24b2253a81b03476e3d4d8cf56d5eb9dbf18 (patch)
treefabb5447e17b9f0959cb83b6d88351367ca53645 /merge
parent298ba0d39d6d38d5be860a3ad8a55b469b67e7d8 (diff)
downloadmariadb-git-184e24b2253a81b03476e3d4d8cf56d5eb9dbf18.tar.gz
Fixed ALTER TABLE on MERGE tables
Fixed bug in DISTINCT Docs/manual.texi: Updated Changelog Cleaned up adding character sets merge/open.c: skip comments myisam/mi_check.c: Fixed bug when sorting index on Windows myisammrg/myrg_info.c: Use only portable printf arguments myisammrg/myrg_rrnd.c: Use only portable printf arguments mysql-test/r/distinct.result: Added test case for bug in distinct mysql-test/r/merge.result: Added test for ALTER TABLE mysql-test/t/distinct.test: Added test case for bug in distinct mysql-test/t/merge.test: Added test for ALTER TABLE sql-bench/crash-me.sh: Fixed portability issues sql/ha_myisammrg.cc: Fixed for ALTER TABLE on MERGE tables sql/item_sum.cc: Fixed bug in DISTINCT sql/sql_db.cc: Added test of namelen in check_db_name sql/sql_select.cc: Fixed bug in DISTINCT sql/sql_select.h: Fixed bug in DISTINCT sql/sql_table.cc: Fixed ALTER TABLE on MERGE tables sql/table.cc: Added test of namelen in check_db_name sql/table.h: Fixed ALTER TABLE on MERGE tables
Diffstat (limited to 'merge')
-rw-r--r--merge/open.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/merge/open.c b/merge/open.c
index 2a3d815cd27..35005e6e718 100644
--- a/merge/open.c
+++ b/merge/open.c
@@ -62,7 +62,7 @@ int handle_locking;
{
if ((end=buff+length)[-1] == '\n')
end[-1]='\0';
- if (buff[0]) /* Skipp empty lines */
+ if (buff[0] && buff[0] != '#') /* Skipp empty lines and comments */
{
last_isam=isam;
if (!test_if_hard_path(buff))