diff options
| author | Alfranio Correia <alfranio.correia@sun.com> | 2010-07-04 20:35:05 +0100 |
|---|---|---|
| committer | Alfranio Correia <alfranio.correia@sun.com> | 2010-07-04 20:35:05 +0100 |
| commit | db7ba46461e4261f362829b94cc3125205b7c64a (patch) | |
| tree | 793384d8d0f9db3aa8ac0bda181c087ab39c9297 | |
| parent | aee88bc8aaa4906814cd2eab80d079b94cbda12a (diff) | |
| download | mariadb-git-db7ba46461e4261f362829b94cc3125205b7c64a.tar.gz | |
Post-push fix for BUG#53259.
| -rw-r--r-- | mysql-test/r/sp_trans_log.result | 2 | ||||
| -rw-r--r-- | mysql-test/t/sp_trans_log.test | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/mysql-test/r/sp_trans_log.result b/mysql-test/r/sp_trans_log.result index 34d24f70848..e3463dec571 100644 --- a/mysql-test/r/sp_trans_log.result +++ b/mysql-test/r/sp_trans_log.result @@ -14,7 +14,7 @@ end| reset master| insert into t2 values (bug23333(),1)| ERROR 23000: Duplicate entry '1' for key 'PRIMARY' -show binlog events from <binlog_start>| +show binlog events from <binlog_start> limit 0, 4| Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Table_map # # table_id: # (test.t1) diff --git a/mysql-test/t/sp_trans_log.test b/mysql-test/t/sp_trans_log.test index f162ee5cea6..972c3dd36eb 100644 --- a/mysql-test/t/sp_trans_log.test +++ b/mysql-test/t/sp_trans_log.test @@ -34,7 +34,10 @@ end| reset master| --error ER_DUP_ENTRY insert into t2 values (bug23333(),1)| -# the following must show there is (are) events after the query */ +# the following must show there are events after the query +# the binlog_limit is used to hide the differences between the mixed +# and row logging formats after BUG#53259 +let $binlog_limit= 0, 4| source include/show_binlog_events.inc| select count(*),@a from t1 /* must be 1,1 */| |