diff options
| author | unknown <svoj@april.(none)> | 2007-05-10 20:01:58 +0500 |
|---|---|---|
| committer | unknown <svoj@april.(none)> | 2007-05-10 20:01:58 +0500 |
| commit | 157bb46fe256ec37b55425629167e08b2abc0880 (patch) | |
| tree | 45e8100231e30c0b99cddafb6f2323c3852a7ace /mysql-test/extra | |
| parent | fd5e7a7c7074bf496312d1c460e7f8bd23a3c41e (diff) | |
| parent | 9cc05ced333a7c60bc0613867f4edeeee9e5e97a (diff) | |
| download | mariadb-git-157bb46fe256ec37b55425629167e08b2abc0880.tar.gz | |
Merge mysql.com:/home/svoj/devel/mysql/BUG27998/mysql-5.0-engines
into mysql.com:/home/svoj/devel/mysql/BUG27998/mysql-5.1-engines
storage/blackhole/ha_blackhole.h:
Use local.
mysql-test/extra/binlog_tests/blackhole.test:
Manual merge.
mysql-test/r/binlog_stm_blackhole.result:
Manual merge.
Diffstat (limited to 'mysql-test/extra')
| -rw-r--r-- | mysql-test/extra/binlog_tests/blackhole.test | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/mysql-test/extra/binlog_tests/blackhole.test b/mysql-test/extra/binlog_tests/blackhole.test index 80f998359ba..9f842a9a4eb 100644 --- a/mysql-test/extra/binlog_tests/blackhole.test +++ b/mysql-test/extra/binlog_tests/blackhole.test @@ -125,6 +125,16 @@ source include/show_binlog_events.inc; drop table t1,t2,t3; # +# BUG#27998 - mysqld crashed when executing INSERT DELAYED on a BLACKHOLE +# table +# +CREATE TABLE t1(a INT) ENGINE=BLACKHOLE; +INSERT DELAYED INTO t1 VALUES(1); +DROP TABLE t1; + +# End of 4.1 tests + +# #Bug#19717: DELETE Query Error on BLACKHOLE when using WHERE on column with UNIQUE INDEX # CREATE TABLE t1(a INT, b INT) ENGINE=BLACKHOLE; @@ -139,7 +149,8 @@ ALTER TABLE t1 ADD PRIMARY KEY(a); DELETE FROM t1 WHERE a=10; DROP TABLE t1; -# End of 4.1 tests +# End of 5.0 tests + # Test that a transaction which is rolled back does not go into binlog # and that a transaction which is committed does @@ -156,4 +167,4 @@ set autocommit=1; source include/show_binlog_events.inc; drop table if exists t1; -# End of 5.0 tests +# End of 5.1 tests |