diff options
| author | unknown <aelkin/andrei@mysql1000.(none)> | 2008-03-29 15:00:12 +0200 |
|---|---|---|
| committer | unknown <aelkin/andrei@mysql1000.(none)> | 2008-03-29 15:00:12 +0200 |
| commit | 6630d2e18ca89fb35fa87aea09784dad55822d29 (patch) | |
| tree | b69f6a865d08077895e9ab32d8392e140da59380 /mysql-test/extra/binlog_tests | |
| parent | cfc420976ec6739ebea4e09518dac4f79c693104 (diff) | |
| parent | 4020e6a2d7910be74c0f22e884c6f4ee8ba7865b (diff) | |
| download | mariadb-git-6630d2e18ca89fb35fa87aea09784dad55822d29.tar.gz | |
Merge mysql1000.(none):/home/andrei/MySQL/MERGE/5.0-main2rpl
into mysql1000.(none):/home/andrei/MySQL/MERGE/5.1-main2rpl
BitKeeper/deleted/.del-binlog_killed_simulate.result:
Auto merged
BitKeeper/deleted/.del-show_binlog_events.inc:
Auto merged
mysql-test/suite/rpl/r/rpl_user.result:
Auto merged
storage/blackhole/ha_blackhole.cc:
Auto merged
BitKeeper/deleted/.del-show_binary_logs.inc:
Delete: mysql-test/include/show_binary_logs.inc
mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result:
manual merge ul.
mysql-test/extra/binlog_tests/blackhole.test:
manual merge
mysql-test/suite/binlog/r/binlog_stm_blackhole.result:
manual merge
sql/log.cc:
manual merge
sql/share/errmsg.txt:
manual merge
sql/sql_class.cc:
manual merge
Diffstat (limited to 'mysql-test/extra/binlog_tests')
| -rw-r--r-- | mysql-test/extra/binlog_tests/blackhole.test | 27 |
1 files changed, 24 insertions, 3 deletions
diff --git a/mysql-test/extra/binlog_tests/blackhole.test b/mysql-test/extra/binlog_tests/blackhole.test index 59d31c3a08b..2d63ae27aa3 100644 --- a/mysql-test/extra/binlog_tests/blackhole.test +++ b/mysql-test/extra/binlog_tests/blackhole.test @@ -151,7 +151,6 @@ 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 @@ -168,7 +167,6 @@ ALTER TABLE t1 ADD PRIMARY KEY(a); DELETE FROM t1 WHERE a=10; DROP TABLE t1; -# 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 @@ -193,4 +191,27 @@ show binlog events; drop table if exists t1; -# End of 5.1 tests +# +# Bug#35178 INSERT_ID not written to binary log for inserts against BLACKHOLE backed tables +# +# +# the test checks that explicitly prescribed with set insert_id= value +# preceeds the following autoincrement insert in a blachhole +# + +reset master; +create table t1 (a int auto_increment, primary key (a)) engine=blackhole; + +# not insert_id prescribed insert binlogs with the default set insert_id 1 +insert into t1 values (11), (NULL), (NULL), (NULL); +set insert_id= 3; +insert into t1 values (NULL), (33), (NULL); +set insert_id= 5; +insert into t1 values (55), (NULL); +source include/show_binlog_events2.inc; + +# cleanup +drop table t1; + + +# End of tests |