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/suite | |
| 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/suite')
| -rw-r--r-- | mysql-test/suite/binlog/r/binlog_stm_blackhole.result | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/mysql-test/suite/binlog/r/binlog_stm_blackhole.result b/mysql-test/suite/binlog/r/binlog_stm_blackhole.result index a96d2fd1bab..cef1d2f94c8 100644 --- a/mysql-test/suite/binlog/r/binlog_stm_blackhole.result +++ b/mysql-test/suite/binlog/r/binlog_stm_blackhole.result @@ -172,3 +172,19 @@ master-bin.000001 # Query # # use `test`; BEGIN master-bin.000001 # Query # # use `test`; insert into t1 values(1) master-bin.000001 # Query # # use `test`; COMMIT drop table if exists t1; +create table t1 (a int auto_increment, primary key (a)) engine=blackhole; +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); +show binlog events from <binlog_start>; +Log_name Pos Event_type Server_id End_log_pos Info +master-bin.000001 # Query 1 # use `test`; create table t1 (a int auto_increment, primary key (a)) engine=blackhole +master-bin.000001 # Intvar 1 # INSERT_ID=1 +master-bin.000001 # Query 1 # use `test`; insert into t1 values (11), (NULL), (NULL), (NULL) +master-bin.000001 # Intvar 1 # INSERT_ID=3 +master-bin.000001 # Query 1 # use `test`; insert into t1 values (NULL), (33), (NULL) +master-bin.000001 # Intvar 1 # INSERT_ID=5 +master-bin.000001 # Query 1 # use `test`; insert into t1 values (55), (NULL) +drop table t1; |