bzr commit into mysql-next-mr branch (aelkin:3141) Bug#50316

[Andrei Elkin]

#At file:///home/andrei/MySQL/BZR/FIXES/next-mr-bug50316-Master_info_file-to-sss/ based on revid:aelkin@stripped

 3141 Andrei Elkin	2010-05-07
      Bug #50316  Add Master_info_file to SHOW SLAVE STATUS
      
      improving the test of the bug

    modified:
      mysql-test/suite/rpl/r/rpl_show_master_info_file.result
      mysql-test/suite/rpl/t/rpl_show_master_info_file.test
=== modified file 'mysql-test/suite/rpl/r/rpl_show_master_info_file.result'
--- a/mysql-test/suite/rpl/r/rpl_show_master_info_file.result	2010-05-06 19:42:27 +0000
+++ b/mysql-test/suite/rpl/r/rpl_show_master_info_file.result	2010-05-07 07:58:38 +0000
@@ -4,45 +4,6 @@ reset master;
 reset slave;
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
 start slave;
-SHOW SLAVE STATUS;
-Slave_IO_State	#
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	13000
-Connect_Retry	1
-Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	107
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	master-bin.000001
-Slave_IO_Running	Yes
-Slave_SQL_Running	Yes
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	#
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	0
-Last_Error	
-Skip_Counter	0
-Exec_Master_Log_Pos	107
-Relay_Log_Space	#
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	#
-Last_IO_Error	#
-Last_SQL_Errno	0
-Last_SQL_Error	
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-Master_Info_File	MYSQLTEST_VARDIR/mysqld.2/data/master.info
+SELECT "MYSQLTEST_VARDIR/mysqld.2/data/master.info" as Master_Info_File;
+Master_Info_File
+MYSQLTEST_VARDIR/mysqld.2/data/master.info

=== modified file 'mysql-test/suite/rpl/t/rpl_show_master_info_file.test'
--- a/mysql-test/suite/rpl/t/rpl_show_master_info_file.test	2010-05-06 19:42:27 +0000
+++ b/mysql-test/suite/rpl/t/rpl_show_master_info_file.test	2010-05-07 07:58:38 +0000
@@ -7,10 +7,12 @@
 source include/master-slave.inc;
 source include/have_binlog_format_mixed.inc;
 
+# test reveals different path separator on windows.
+# Leaving out windows because there is nothing more platform specific.
+source include/not_windows.inc;
+
 connection slave;
 
---replace_result $MASTER_MYPORT MASTER_PORT
+--let $master_info_file= query_get_value(SHOW SLAVE STATUS, Master_Info_File, 1)
 --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
---replace_column 1 # 8 # 9 # 16 # 23 # 33 # 35 # 36 #
-
-query_vertical SHOW SLAVE STATUS;
+--eval SELECT "$master_info_file" as Master_Info_File


Attachment: [text/bzr-bundle] bzr/[e-mail]