Merge magare.gmz:/home/kgeorge/mysql/work/B29116-4.1-opt

into  magare.gmz:/home/kgeorge/mysql/work/B29116-5.0-opt


mysql-test/t/rpl_change_master.test:
  Auto merged

mysql-test/t/rpl_change_master.test

@@ -20,11 +20,11 @@ connection slave;
 stop slave;
 --replace_result $MASTER_MYPORT MASTER_MYPORT
 --replace_column 1 # 8 # 9 # 23 # 33 #
-show slave status;
+query_vertical show slave status;
 change master to master_user='root';
 --replace_result $MASTER_MYPORT MASTER_MYPORT
 --replace_column 1 # 8 # 9 # 23 # 33 #
-show slave status;
+query_vertical show slave status;
 start slave;
 sync_with_master;
 select * from t1;