bk commit into 5.1 tree (gkodinov:1.2562)

[kgeorge]

Below is the list of changes that have just been committed into a local
5.1 repository of kgeorge. When kgeorge 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-07-27 17:29:48+03:00, gkodinov@stripped +2 -0
  fixing the 5.1-opt merge of the fix for bug 29571: 
  cannot check the statments in the binlog for row based 
  replication.

  mysql-test/extra/rpl_tests/rpl_insert_delayed.test@stripped, 2007-07-27 17:29:46+03:00,
gkodinov@stripped +27 -14
    fixing the 5.1-opt merge of the fix for bug 29571: 
    cannot check the statments in the binlog for row based 
    replication.

  mysql-test/suite/rpl/r/rpl_row_insert_delayed.result@stripped, 2007-07-27 17:29:46+03:00,
gkodinov@stripped +0 -12
    fixing the 5.1-opt merge of the fix for bug 29571: 
    cannot check the statments in the binlog for row based 
    replication.

diff -Nrup a/mysql-test/extra/rpl_tests/rpl_insert_delayed.test
b/mysql-test/extra/rpl_tests/rpl_insert_delayed.test
--- a/mysql-test/extra/rpl_tests/rpl_insert_delayed.test	2007-07-27 14:28:34 +03:00
+++ b/mysql-test/extra/rpl_tests/rpl_insert_delayed.test	2007-07-27 17:29:46 +03:00
@@ -90,27 +90,36 @@ connection master;
 # Bug #29571: INSERT DELAYED IGNORE written to binary log on the master but
 # on the slave
 #
-#flush the logs before the test
-connection slave;
-FLUSH LOGS;
-connection master;
-FLUSH LOGS;
+if  (`SELECT @@global.binlog_format != 'ROW'`)
+{
+  #flush the logs before the test
+  connection slave;
+  FLUSH LOGS;
+  connection master;
+  FLUSH LOGS;
+}
 
 CREATE TABLE t1(a int, UNIQUE(a));
 INSERT DELAYED IGNORE INTO t1 VALUES(1);
 INSERT DELAYED IGNORE INTO t1 VALUES(1);
 flush table t1; # to wait for INSERT DELAYED to be done
 
-#must show two INSERT DELAYED
---replace_column 1 x 2 x 3 x 4 x 5 x
-show binlog events in 'master-bin.000002' LIMIT 2,2;
+if  (`SELECT @@global.binlog_format != 'ROW'`)
+{
+  #must show two INSERT DELAYED
+  --replace_column 1 x 2 x 3 x 4 x 5 x
+  show binlog events in 'master-bin.000002' LIMIT 2,2;
+}
 select * from t1;
 
 sync_slave_with_master;
 echo On slave;
-#must show two INSERT DELAYED
---replace_column 1 x 2 x 3 x 4 x 5 x
-show binlog events in 'slave-bin.000002' LIMIT 2,2;
+if  (`SELECT @@global.binlog_format != 'ROW'`)
+{
+  #must show two INSERT DELAYED
+  --replace_column 1 x 2 x 3 x 4 x 5 x
+  show binlog events in 'slave-bin.000002' LIMIT 2,2;
+}
 select * from t1;
 
 
@@ -118,10 +127,14 @@ select * from t1;
 connection master;
 drop table t1;
 sync_slave_with_master;
-#flush the logs after the test
-FLUSH LOGS;
+if  (`SELECT @@global.binlog_format != 'ROW'`)
+{
+  #flush the logs after the test
+  FLUSH LOGS;
+  connection master;
+  FLUSH LOGS;
+}
 connection master;
-FLUSH LOGS;
 
 
 --echo End of 5.0 tests
diff -Nrup a/mysql-test/suite/rpl/r/rpl_row_insert_delayed.result
b/mysql-test/suite/rpl/r/rpl_row_insert_delayed.result
--- a/mysql-test/suite/rpl/r/rpl_row_insert_delayed.result	2007-07-27 15:36:08 +03:00
+++ b/mysql-test/suite/rpl/r/rpl_row_insert_delayed.result	2007-07-27 17:29:46 +03:00
@@ -46,29 +46,17 @@ id	name
 USE test;
 DROP SCHEMA mysqlslap;
 use test;
-FLUSH LOGS;
-FLUSH LOGS;
 CREATE TABLE t1(a int, UNIQUE(a));
 INSERT DELAYED IGNORE INTO t1 VALUES(1);
 INSERT DELAYED IGNORE INTO t1 VALUES(1);
 flush table t1;
-show binlog events in 'master-bin.000002' LIMIT 2,2;
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-x	x	x	x	x	table_id: 23 (test.t1)
-x	x	x	x	x	table_id: 23 flags: STMT_END_F
 select * from t1;
 a
 1
 On slave
-show binlog events in 'slave-bin.000002' LIMIT 2,2;
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-x	x	x	x	x	table_id: 23 (test.t1)
-x	x	x	x	x	table_id: 23 flags: STMT_END_F
 select * from t1;
 a
 1
 drop table t1;
-FLUSH LOGS;
-FLUSH LOGS;
 End of 5.0 tests
 set @@global.binlog_format = @old_global_binlog_format;