bzr commit into mysql-trunk-bugfixing branch (alfranio.correia:3086) Bug#53259

[Alfranio Correia]

#At file:///home/acorreia/workspace.sun/repository.mysql.new/bzrwork/bug-53259/mysql-trunk-bugfixing.merge/ based on revid:alik@ibmvm-20100702062300-3cceo4fdbu3b0qkr

 3086 Alfranio Correia	2010-07-04
      Post-push fix for BUG#53259.

    modified:
      mysql-test/r/sp_trans_log.result
      mysql-test/t/sp_trans_log.test
=== modified file 'mysql-test/r/sp_trans_log.result'
--- a/mysql-test/r/sp_trans_log.result	2010-05-26 14:34:25 +0000
+++ b/mysql-test/r/sp_trans_log.result	2010-07-04 19:26:43 +0000
@@ -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)

=== modified file 'mysql-test/t/sp_trans_log.test'
--- a/mysql-test/t/sp_trans_log.test	2010-05-26 14:34:25 +0000
+++ b/mysql-test/t/sp_trans_log.test	2010-07-04 19:26:43 +0000
@@ -35,6 +35,9 @@ reset master|
 --error ER_DUP_ENTRY
 insert into t2 values (bug23333(),1)| 
 # the following must show there is (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 */|
 


Attachment: [text/bzr-bundle]