bk commit into 6.0 tree (knielsen:1.2555)

[knielsen]

Below is the list of changes that have just been committed into a local
6.0 repository of knielsen.  When knielsen 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, 2008-03-07 14:07:41+01:00, knielsen@ymer.(none) +1 -0
  After-merge fix.

  mysql-test/suite/rpl/r/rpl_stm_reset_slave.result@stripped, 2008-03-07 14:07:38+01:00,
knielsen@ymer.(none) +1 -1
    After-merge fix.

diff -Nrup a/mysql-test/suite/rpl/r/rpl_stm_reset_slave.result
b/mysql-test/suite/rpl/r/rpl_stm_reset_slave.result
--- a/mysql-test/suite/rpl/r/rpl_stm_reset_slave.result	2008-02-20 15:07:00 +01:00
+++ b/mysql-test/suite/rpl/r/rpl_stm_reset_slave.result	2008-03-07 14:07:38 +01:00
@@ -126,8 +126,8 @@ Last_IO_Errno	#
 Last_IO_Error	#
 Last_SQL_Errno	0
 Last_SQL_Error	
-change master to master_user='root';
 Master_Bind	0.0.0.0
+change master to master_user='root';
 start slave;
 SHOW SLAVE STATUS;
 Slave_IO_State	#