bzr commit into mysql-6.0-rpl branch (zhou.li:2827) Bug#42858

[Leonard Zhou]

#At file:///home/zhl/mysql/rep/6.0/bug42858/

 2827 Leonard Zhou	2009-03-18
      BUG#42858 rpl.rpl_log_pos fails, thus was disabled.
            
      The test result of rpl_log_pos is wrong.
            
      Correct test result.
modified:
  mysql-test/suite/rpl/r/rpl_log_pos.result
  mysql-test/suite/rpl/t/disabled.def

per-file messages:
  mysql-test/suite/rpl/r/rpl_log_pos.result
    Modify test result
  mysql-test/suite/rpl/t/disabled.def
    Remove rpl_log_pos from disabled list
=== modified file 'mysql-test/suite/rpl/r/rpl_log_pos.result'
--- a/mysql-test/suite/rpl/r/rpl_log_pos.result	2008-07-10 16:09:39 +0000
+++ b/mysql-test/suite/rpl/r/rpl_log_pos.result	2009-03-18 02:54:46 +0000
@@ -48,6 +48,8 @@ Last_IO_Errno	#
 Last_IO_Error	#
 Last_SQL_Errno	0
 Last_SQL_Error	
+Replicate_Ignore_Server_Ids	
+Master_Server_Id	1
 start slave;
 include/stop_slave.inc
 SHOW SLAVE STATUS;
@@ -89,6 +91,8 @@ Last_IO_Errno	#
 Last_IO_Error	#
 Last_SQL_Errno	0
 Last_SQL_Error	
+Replicate_Ignore_Server_Ids	
+Master_Server_Id	1
 show master status;
 File	Position	Binlog_Do_DB	Binlog_Ignore_DB
 master-bin.000001	#	<Binlog_Do_DB>	<Binlog_Ignore_DB>

=== modified file 'mysql-test/suite/rpl/t/disabled.def'
--- a/mysql-test/suite/rpl/t/disabled.def	2009-02-14 11:23:14 +0000
+++ b/mysql-test/suite/rpl/t/disabled.def	2009-03-18 02:54:46 +0000
@@ -16,4 +16,3 @@ rpl_row_until              : BUG#41423 2
 rpl_binlog_corruption      : BUG#41793 2008-12-30 sven rpl_binlog_corruption disabled in main (needs new mtr)
 rpl_extraCol_falcon        : Bug#40930 2008-11-21 johnemb rpl.rpl_extraCol_falcon fails doing STOP SLAVE (on Windows PB2)
 rpl_cross_version	   : Bug#42311 2009-01-23 aelkin
-rpl_log_pos                : Bug#42858 2009-02-14 alik rpl.rpl_log_pos fails, thus was disabled