diff options
| author | unknown <ingo/mydev@chilla.local> | 2006-07-11 13:01:27 +0200 |
|---|---|---|
| committer | unknown <ingo/mydev@chilla.local> | 2006-07-11 13:01:27 +0200 |
| commit | 034522f47dd56dffb4b590ab02d3ab3cdb65b6c8 (patch) | |
| tree | 828a6e191b240ff69b4846a899dbf71b6375ae98 /mysql-test/t | |
| parent | 0859819aae7f1d3a8c784b5468e3cb3187dba64f (diff) | |
| parent | 1a7e4ac0bbe8f87494124bd4ded7fe5e4f99498f (diff) | |
| download | mariadb-git-034522f47dd56dffb4b590ab02d3ab3cdb65b6c8.tar.gz | |
Merge chilla.local:/home/mydev/mysql-5.0-release
into chilla.local:/home/mydev/mysql-5.0-amerge
sql/handler.h:
Auto merged
sql/sql_table.cc:
Auto merged
Diffstat (limited to 'mysql-test/t')
| -rw-r--r-- | mysql-test/t/blackhole.test | 12 | ||||
| -rw-r--r-- | mysql-test/t/merge.test | 10 |
2 files changed, 0 insertions, 22 deletions
diff --git a/mysql-test/t/blackhole.test b/mysql-test/t/blackhole.test index 493f74ded3e..e40b84eb5cd 100644 --- a/mysql-test/t/blackhole.test +++ b/mysql-test/t/blackhole.test @@ -128,15 +128,3 @@ show binlog events; drop table t1,t2,t3; # End of 4.1 tests - -# -# BUG#10952 - alter table ... lost data without errors and warnings -# -drop table if exists t1; -create table t1 (c char(20)) engine=MyISAM; -insert into t1 values ("Monty"),("WAX"),("Walrus"); ---error 1031 -alter table t1 engine=blackhole; -drop table t1; - -# End of 5.0 tests diff --git a/mysql-test/t/merge.test b/mysql-test/t/merge.test index 400279a826b..639129e1393 100644 --- a/mysql-test/t/merge.test +++ b/mysql-test/t/merge.test @@ -381,16 +381,6 @@ drop table t1, t2, t3; # End of 4.1 tests # -# BUG#10952 - alter table ... lost data without errors and warnings -# -drop table if exists t1; -create table t1 (c char(20)) engine=MyISAM; -insert into t1 values ("Monty"),("WAX"),("Walrus"); ---error 1031 -alter table t1 engine=MERGE; -drop table t1; - -# # BUG#19648 - Merge table does not work with bit types # create table t1 (b bit(1)); |