bzr commit into mysql-6.0-backup branch (hema:2876) Bug#45284

[Hema Sridharan]

#At file:///export/home/tmp/BUG45284/mysql-6.0-backup/ based on revid:rafal.somla@stripped

 2876 Hema Sridharan	2009-10-02
      BUG#45284 (rpl_backup_multi test fails in PB)
      The patch fix for this bug will mask out
      master_log_file column from SHOW SLAVE STATUS
      command.
      modified:
        mysql-test/suite/rpl/r/rpl_backup_multi.result
        mysql-test/suite/rpl/t/rpl_backup_multi.test

per-file messages:
  mysql-test/suite/rpl/r/rpl_backup_multi.result
    Modified result file fot rpl_backup_multi.test
  mysql-test/suite/rpl/t/rpl_backup_multi.test
    Modified the test file to mask out relay_master_log_file column from 
    SHOW SLAVE STATUS command
=== modified file 'mysql-test/suite/rpl/r/rpl_backup_multi.result'
--- a/mysql-test/suite/rpl/r/rpl_backup_multi.result	2009-05-26 22:21:34 +0000
+++ b/mysql-test/suite/rpl/r/rpl_backup_multi.result	2009-10-02 14:55:44 +0000
@@ -122,7 +122,7 @@ Master_Log_File	#
 Read_Master_Log_Pos	#
 Relay_Log_File	#
 Relay_Log_Pos	#
-Relay_Master_Log_File	mysqld-bin.000001
+Relay_Master_Log_File	#
 Slave_IO_Running	Yes
 Slave_SQL_Running	Yes
 Replicate_Do_DB	
@@ -213,7 +213,7 @@ Master_Log_File	#
 Read_Master_Log_Pos	#
 Relay_Log_File	#
 Relay_Log_Pos	#
-Relay_Master_Log_File	mysqld-bin.000001
+Relay_Master_Log_File	#
 Slave_IO_Running	Yes
 Slave_SQL_Running	Yes
 Replicate_Do_DB	
@@ -289,7 +289,7 @@ Master_Log_File	#
 Read_Master_Log_Pos	#
 Relay_Log_File	#
 Relay_Log_Pos	#
-Relay_Master_Log_File	mysqld-bin.000001
+Relay_Master_Log_File	#
 Slave_IO_Running	Yes
 Slave_SQL_Running	Yes
 Replicate_Do_DB	
@@ -392,7 +392,7 @@ Master_Log_File	#
 Read_Master_Log_Pos	#
 Relay_Log_File	#
 Relay_Log_Pos	#
-Relay_Master_Log_File	mysqld-bin.000001
+Relay_Master_Log_File	#
 Slave_IO_Running	Yes
 Slave_SQL_Running	No
 Replicate_Do_DB	
@@ -472,7 +472,7 @@ Master_Log_File	#
 Read_Master_Log_Pos	#
 Relay_Log_File	#
 Relay_Log_Pos	#
-Relay_Master_Log_File	mysqld-bin.000001
+Relay_Master_Log_File	#
 Slave_IO_Running	Yes
 Slave_SQL_Running	No
 Replicate_Do_DB	
@@ -550,7 +550,7 @@ Master_Log_File	#
 Read_Master_Log_Pos	#
 Relay_Log_File	#
 Relay_Log_Pos	#
-Relay_Master_Log_File	mysqld-bin.000001
+Relay_Master_Log_File	#
 Slave_IO_Running	Yes
 Slave_SQL_Running	Yes
 Replicate_Do_DB	
@@ -637,7 +637,7 @@ Master_Log_File	#
 Read_Master_Log_Pos	#
 Relay_Log_File	#
 Relay_Log_Pos	#
-Relay_Master_Log_File	mysqld-bin.000002
+Relay_Master_Log_File	#
 Slave_IO_Running	No
 Slave_SQL_Running	No
 Replicate_Do_DB	
@@ -715,7 +715,7 @@ Master_Log_File	#
 Read_Master_Log_Pos	#
 Relay_Log_File	#
 Relay_Log_Pos	#
-Relay_Master_Log_File	mysqld-bin.000001
+Relay_Master_Log_File	#
 Slave_IO_Running	Yes
 Slave_SQL_Running	No
 Replicate_Do_DB	

=== modified file 'mysql-test/suite/rpl/t/rpl_backup_multi.test'
--- a/mysql-test/suite/rpl/t/rpl_backup_multi.test	2009-06-24 19:39:33 +0000
+++ b/mysql-test/suite/rpl/t/rpl_backup_multi.test	2009-10-02 14:55:44 +0000
@@ -54,7 +54,7 @@ sync_with_master;
 let $MYSQLD_S_DATADIR= `select @@datadir`;
 
 --replace_result $MASTER_MYPORT MASTER_PORT
---replace_column 1 # 6 # 7 # 8 # 9 # 22 # 23 # 33 #
+--replace_column 1 # 6 # 7 # 8 # 9 # 10 # 22 # 23 # 33 #
 --query_vertical SHOW SLAVE STATUS;
 
 --echo # Verify all objects and exercise them
@@ -85,7 +85,7 @@ SHOW FULL TABLES FROM db1;
 --connection slave_2
 sync_with_master;
 --replace_result $SLAVE_MYPORT SLAVE_PORT
---replace_column 1 # 6 # 7 # 8 # 9 # 22 # 23 # 33 #
+--replace_column 1 # 6 # 7 # 8 # 9 # 10 # 22 # 23 # 33 #
 --query_vertical SHOW SLAVE STATUS;
 
 --echo # Note that db1 will have table s1
@@ -109,7 +109,7 @@ SELECT db1.f1();
 --connection slave_3
 sync_with_master;
 --replace_result $MASTER_MYPORT MASTER_PORT
---replace_column 1 # 6 # 7 # 8 # 9 # 22 # 23 # 33 #
+--replace_column 1 # 6 # 7 # 8 # 9 # 10 # 22 # 23 # 33 #
 --query_vertical SHOW SLAVE STATUS;
 
 --echo # Check the objects and other table contents in slave3
@@ -156,7 +156,7 @@ eval SHOW BINLOG EVENTS FROM $master_pos
 source include/wait_for_slave_sql_to_stop.inc;
 
 --replace_result $MASTER_MYPORT MASTER_PORT
---replace_column 1 # 6 # 7 # 8 # 9 # 22 # 23 # 33 #
+--replace_column 1 # 6 # 7 # 8 # 9 # 10 # 22 # 23 # 33 #
 --query_vertical SHOW SLAVE STATUS
 
 --echo
@@ -191,7 +191,7 @@ SELECT db1.f1();
 source include/wait_for_slave_sql_to_stop.inc;
 
 --replace_result $MASTER_MYPORT MASTER_PORT
---replace_column 1 # 6 # 7 # 8 # 9 # 22 # 23 # 33 #
+--replace_column 1 # 6 # 7 # 8 # 9 # 10 # 22 # 23 # 33 #
 --query_vertical SHOW SLAVE STATUS
 
 --echo
@@ -226,7 +226,7 @@ SELECT db1.f1();
 sync_with_master;
 
 --replace_result $SLAVE_MYPORT SLAVE_PORT
---replace_column 1 # 6 # 7 # 8 # 9 # 22 # 23 # 33 #
+--replace_column 1 # 6 # 7 # 8 # 9 # 10 # 22 # 23 # 33 #
 --query_vertical SHOW SLAVE STATUS
 
 --echo
@@ -263,7 +263,7 @@ STOP SLAVE;
 RESTORE FROM 'db12s.bak' OVERWRITE;
 
 --replace_result $MASTER_MYPORT MASTER_PORT
---replace_column 1 # 6 # 7 # 8 # 9 # 22 # 23 # 33 #
+--replace_column 1 # 6 # 7 # 8 # 9 # 10 # 22 # 23 # 33 #
 --query_vertical SHOW SLAVE STATUS
 
 --echo
@@ -290,7 +290,7 @@ SELECT db1.f1();
 source include/wait_for_slave_sql_to_stop.inc;
 
 --replace_result $SLAVE_MYPORT SLAVE_PORT
---replace_column 1 # 6 # 7 # 8 # 9 # 22 # 23 # 33 #
+--replace_column 1 # 6 # 7 # 8 # 9 # 10 # 22 # 23 # 33 #
 --query_vertical SHOW SLAVE STATUS
 
 --echo