bk commit into 5.0 tree (aelkin:1.2498) BUG#23333

[Andrei Elkin]

Below is the list of changes that have just been committed into a local
5.0 repository of elkin. When elkin does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-08-22 15:43:16+03:00, aelkin@stripped +2 -0
  bug#23333
  
  fixing the test due a to different offsets in binlog with ps-protocol (a possible bug to be reported)

  mysql-test/r/sp_trans_log.result@stripped, 2007-08-22 15:43:13+03:00, aelkin@stripped +4 -3
    results changed as prescribed

  mysql-test/t/sp_trans_log.test@stripped, 2007-08-22 15:43:13+03:00, aelkin@stripped +2 -1
    Replacing the reporting pattern
    
    ### a possible bug: 
    #show master status /* the offset must denote there is the query */|
    # displays different offests in ps-protocol
    
    with 
      show binlog events

diff -Nrup a/mysql-test/r/sp_trans_log.result b/mysql-test/r/sp_trans_log.result
--- a/mysql-test/r/sp_trans_log.result	2007-08-21 15:16:51 +03:00
+++ b/mysql-test/r/sp_trans_log.result	2007-08-22 15:43:13 +03:00
@@ -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
diff -Nrup a/mysql-test/t/sp_trans_log.test b/mysql-test/t/sp_trans_log.test
--- a/mysql-test/t/sp_trans_log.test	2007-08-21 15:16:52 +03:00
+++ b/mysql-test/t/sp_trans_log.test	2007-08-22 15:43:13 +03:00
@@ -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|