Merge mysql.com:/Users/emurphy/src/bk-clean/mysql-4.1

into  mysql.com:/Users/emurphy/src/work/mysql-4.1-bug12330

mysql-test/t/rpl_slave_status.test

@@ -23,6 +23,7 @@ connection slave;
 stop slave;
 start slave;
 --replace_result $MASTER_MYPORT MASTER_MYPORT
+--replace_column 7 # 8 # 9 # 22 # 23 #
 --vertical_results
 show slave status;