diff options
| author | Alfranio Correia <alfranio.correia@sun.com> | 2009-12-17 21:43:35 +0000 |
|---|---|---|
| committer | Alfranio Correia <alfranio.correia@sun.com> | 2009-12-17 21:43:35 +0000 |
| commit | d9bb76edb232713998f1c62f0744f597e08462d2 (patch) | |
| tree | fb25bfc9b6c669b42e70afadf7790f0f8d7db7e3 /mysql-test/suite/binlog/r/binlog_killed.result | |
| parent | e7a58aa5881aac0e3190b807797a38b97fd14d57 (diff) | |
| parent | 0d90d16291415794d54bcf612524915980ea8f6d (diff) | |
| download | mariadb-git-d9bb76edb232713998f1c62f0744f597e08462d2.tar.gz | |
merge mysql-5.1-rep+3 --> mysql-5.1-rep+2-delivery1
Diffstat (limited to 'mysql-test/suite/binlog/r/binlog_killed.result')
| -rw-r--r-- | mysql-test/suite/binlog/r/binlog_killed.result | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/mysql-test/suite/binlog/r/binlog_killed.result b/mysql-test/suite/binlog/r/binlog_killed.result index 72fda535b6f..905c94a2e9e 100644 --- a/mysql-test/suite/binlog/r/binlog_killed.result +++ b/mysql-test/suite/binlog/r/binlog_killed.result @@ -1,3 +1,4 @@ +call mtr.add_suppression("Unsafe statement binlogged in statement format since BINLOG_FORMAT = STATEMENT"); create table t1 (a int auto_increment, b int, PRIMARY KEY (a)) ENGINE=InnoDB; create table t2 (a int auto_increment, b int, PRIMARY KEY (a)) ENGINE=MyISAM; create table t3 (a int auto_increment, b int, PRIMARY KEY (a)) ENGINE=InnoDB; @@ -87,8 +88,10 @@ select @b /* must be 1 at the end of a stmt calling bug27563() */; must have the update query event more to FD show binlog events from <binlog_start>; Log_name Pos Event_type Server_id End_log_pos Info +master-bin.000001 # Query # # BEGIN master-bin.000001 # User var # # @`b`=0 master-bin.000001 # Query # # use `test`; update t4 set b=b + bug27563(b) +master-bin.000001 # Query # # COMMIT select (@a:=load_file("MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog")) is not null; @@ -123,8 +126,10 @@ select @b /* must be 1 at the end of a stmt calling bug27563() */; must have the delete query event more to FD show binlog events from <binlog_start>; Log_name Pos Event_type Server_id End_log_pos Info +master-bin.000001 # Query # # BEGIN master-bin.000001 # User var # # @`b`=0 master-bin.000001 # Query # # use `test`; delete from t4 where b=bug27563(1) or b=bug27563(2) +master-bin.000001 # Query # # COMMIT select (@a:=load_file("MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog")) is not null; |