Commit d4192c14 authored by aelkin/elkin@dsl-hkibras-fe38f900-157.dhcp.inet.fi's avatar aelkin/elkin@dsl-hkibras-fe38f900-157.dhcp.inet.fi
Browse files

bug#23333 

fixing the test due a to different offsets in binlog with ps-protocol (a possible bug to be reported)
parent 81be5057

mysql-test/r/sp_trans_log.result

+4 −3
Original line number Diff line number Diff line
@@ -12,9 +12,10 @@ end| 
reset master|

insert into t2 values (bug23333(),1)|

ERROR 23000: Duplicate entry '1' for key 1

show master status /* the offset must denote there is the query */|

File	Position	Binlog_Do_DB	Binlog_Ignore_DB

master-bin.000001	284		

show binlog events from 98 /* with fixes for #23333 will show there are 2 queries */|

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

master-bin.000001	#	Query	1	#	#

master-bin.000001	#	Query	1	#	#

select count(*),@a from t1 /* must be 1,1 */|

count(*)	@a

1	1

mysql-test/t/sp_trans_log.test

+2 −1
Original line number Diff line number Diff line
@@ -26,7 +26,8 @@ end| 
reset master|

--error ER_DUP_ENTRY

insert into t2 values (bug23333(),1)| 

show master status /* the offset must denote there is the query */|

--replace_column 2 # 5 # 6 #

show binlog events from 98 /* with fixes for #23333 will show there are 2 queries */|

select count(*),@a from t1 /* must be 1,1 */|

drop table t1, t2|