bk commit into 5.0 tree (gluh:1.2512) BUG#28893

[gluh]

Below is the list of changes that have just been committed into a local
5.0 repository of gluh. When gluh 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, 2007-08-14 13:31:26+05:00, gluh@stripped +3 -0
  Bug#28893 --relay-log variable is not exposed with SHOW VARIABLES
  added variables relay_log, relay_log_index, relay_log_info_file to init_vars[]
  to make them visible within SHOW VARIABLES

  mysql-test/r/rpl_flush_log_loop.result@stripped, 2007-08-14 13:31:25+05:00, gluh@stripped
+7 -0
    test result

  mysql-test/t/rpl_flush_log_loop.test@stripped, 2007-08-14 13:31:25+05:00, gluh@stripped +3
-0
    test case

  sql/set_var.cc@stripped, 2007-08-14 13:31:25+05:00, gluh@stripped +3 -0
    Bug#28893 --relay-log variable is not exposed with SHOW VARIABLES
    added variables relay_log, relay_log_index, relay_log_info_file to init_vars[]
    to make them visible within SHOW VARIABLES

diff -Nrup a/mysql-test/r/rpl_flush_log_loop.result
b/mysql-test/r/rpl_flush_log_loop.result
--- a/mysql-test/r/rpl_flush_log_loop.result	2005-09-01 15:22:18 +05:00
+++ b/mysql-test/r/rpl_flush_log_loop.result	2007-08-14 13:31:25 +05:00
@@ -4,6 +4,13 @@ reset master;
 reset slave;
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
 start slave;
+show variables like 'relay_log%';
+Variable_name	Value
+relay_log	MYSQLTEST_VARDIR/master-data/relay-log
+relay_log_index	
+relay_log_info_file	relay-log.info
+relay_log_purge	ON
+relay_log_space_limit	0
 stop slave;
 change master to master_host='127.0.0.1',master_user='root',
 master_password='',master_port=MASTER_PORT;
diff -Nrup a/mysql-test/t/rpl_flush_log_loop.test b/mysql-test/t/rpl_flush_log_loop.test
--- a/mysql-test/t/rpl_flush_log_loop.test	2005-09-16 00:17:37 +05:00
+++ b/mysql-test/t/rpl_flush_log_loop.test	2007-08-14 13:31:25 +05:00
@@ -3,6 +3,9 @@
 
 source include/master-slave.inc;
 
+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
+show variables like 'relay_log%';
+
 connection slave;
 stop slave;
 --replace_result $MASTER_MYPORT MASTER_PORT
diff -Nrup a/sql/set_var.cc b/sql/set_var.cc
--- a/sql/set_var.cc	2007-07-30 20:27:30 +05:00
+++ b/sql/set_var.cc	2007-08-14 13:31:25 +05:00
@@ -1040,6 +1040,9 @@ struct show_var_st init_vars[]= {
   {sys_readonly.name,         (char*) &sys_readonly,                SHOW_SYS},
   {sys_read_rnd_buff_size.name,(char*) &sys_read_rnd_buff_size,	    SHOW_SYS},
 #ifdef HAVE_REPLICATION
+  {"relay_log" , (char*) &opt_relay_logname, SHOW_CHAR_PTR},
+  {"relay_log_index", (char*) &opt_relaylog_index_name, SHOW_CHAR_PTR},
+  {"relay_log_info_file", (char*) &relay_log_info_file, SHOW_CHAR_PTR},
   {sys_relay_log_purge.name,  (char*) &sys_relay_log_purge,         SHOW_SYS},
   {"relay_log_space_limit",  (char*) &relay_log_space_limit,        SHOW_LONGLONG},
 #endif