diff options
| author | unknown <ingo/mydev@chilla.local> | 2006-07-24 10:05:17 +0200 |
|---|---|---|
| committer | unknown <ingo/mydev@chilla.local> | 2006-07-24 10:05:17 +0200 |
| commit | 93528f288795c6d8efafeeeaf550b3f799b9cc38 (patch) | |
| tree | 638d4dfead823eae779c92bde50e3b1db2d58c2b /mysql-test/t/merge.test | |
| parent | 7b2cabd902d3b6c669bd8a0302aaf8b7568cad06 (diff) | |
| parent | 034522f47dd56dffb4b590ab02d3ab3cdb65b6c8 (diff) | |
| download | mariadb-git-93528f288795c6d8efafeeeaf550b3f799b9cc38.tar.gz | |
Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0
into chilla.local:/home/mydev/mysql-5.1-amerge
mysql-test/r/merge.result:
Auto merged
mysql-test/t/merge.test:
Auto merged
sql/sql_table.cc:
Auto merged
storage/ndb/include/kernel/GlobalSignalNumbers.h:
Auto merged
storage/ndb/src/common/debugger/signaldata/SignalNames.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
Auto merged
configure.in:
Manual merge
mysql-test/extra/binlog_tests/blackhole.test:
Manual merge
mysql-test/r/binlog_stm_blackhole.result:
Manual merge
sql/ha_myisammrg.cc:
Manual merge
sql/handler.h:
Manual merge
storage/blackhole/ha_blackhole.cc:
Manual merge
support-files/mysql.spec.sh:
Manual merge
Diffstat (limited to 'mysql-test/t/merge.test')
| -rw-r--r-- | mysql-test/t/merge.test | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/mysql-test/t/merge.test b/mysql-test/t/merge.test index c211ff2ac29..33282348325 100644 --- a/mysql-test/t/merge.test +++ b/mysql-test/t/merge.test @@ -384,16 +384,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)); |