1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Post-push fix for BUG#53259.

Browse Source
This commit is contained in:
Alfranio Correia 2010-07-04 20:35:05 +01:00
parent 7ec3680161
commit 7e3236fefe
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/r/sp_trans_log.result
View File

@ -14,7 +14,7 @@ end|
reset master| reset master|
insert into t2 values (bug23333(),1)| insert into t2 values (bug23333(),1)|
ERROR 23000: Duplicate entry '1' for key 'PRIMARY' 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 Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Query # # BEGIN master-bin.000001 # Query # # BEGIN
master-bin.000001 # Table_map # # table_id: # (test.t1) master-bin.000001 # Table_map # # table_id: # (test.t1)

5
mysql-test/t/sp_trans_log.test
View File

@ -34,7 +34,10 @@ end|
reset master| reset master|
--error ER_DUP_ENTRY --error ER_DUP_ENTRY
insert into t2 values (bug23333(),1)| 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| source include/show_binlog_events.inc|
select count(*),@a from t1 /* must be 1,1 */| select count(*),@a from t1 /* must be 1,1 */|