diff options
| author | unknown <monty@donna.mysql.com> | 2001-01-28 21:35:50 +0200 |
|---|---|---|
| committer | unknown <monty@donna.mysql.com> | 2001-01-28 21:35:50 +0200 |
| commit | 184e24b2253a81b03476e3d4d8cf56d5eb9dbf18 (patch) | |
| tree | fabb5447e17b9f0959cb83b6d88351367ca53645 /mysql-test/t/merge.test | |
| parent | 298ba0d39d6d38d5be860a3ad8a55b469b67e7d8 (diff) | |
| download | mariadb-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 'mysql-test/t/merge.test')
| -rw-r--r-- | mysql-test/t/merge.test | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/mysql-test/t/merge.test b/mysql-test/t/merge.test index a3b2c8a11de..2f4482d9723 100644 --- a/mysql-test/t/merge.test +++ b/mysql-test/t/merge.test @@ -35,7 +35,8 @@ select a from t3 order by a desc limit 300,10; # The following should give errors create table t4 (a int not null, b char(10), key(a)) type=MERGE UNION=(t1,t2); -drop table if exists t1,t2,t3,t4; +# Because of windows, it's important that we drop the merge tables first! +drop table if exists t4,t3,t1,t2; create table t1 (c char(10)) type=myisam; create table t2 (c char(10)) type=myisam; @@ -70,6 +71,12 @@ INSERT INTO t1 VALUES (11,20),(13,43),(15,11),(17,22),(19,37); INSERT INTO t2 VALUES (12,25),(14,31),(16,42),(18,27),(10,30); SELECT * from t3 where incr in (1,2,3,4) order by othr; +alter table t3 UNION=(t1); +select count(*) from t3; +alter table t3 UNION=(t1,t2); +select count(*) from t3; +alter table t3 TYPE=MYISAM; +select count(*) from t3; drop table t3,t2,t1; # |