bk commit into 4.1 tree (gluh:1.2123) BUG#7100

[gluh]

Below is the list of changes that have just been committed into a local
4.1 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
  1.2123 05/03/16 15:57:57 gluh@stripped +3 -0
  Fix for bug #7100: relay_log_space_max missing from SHOW VARIABLES

  sql/set_var.cc
    1.162 05/03/16 15:57:51 gluh@stripped +1 -0
    Fix for bug #7100: relay_log_space_max missing from SHOW VARIABLES

  mysql-test/t/rpl000005.test
    1.13 05/03/16 15:57:51 gluh@stripped +5 -0
    Fix for bug #7100: relay_log_space_max missing from SHOW VARIABLES

  mysql-test/r/rpl000005.result
    1.12 05/03/16 15:57:51 gluh@stripped +3 -0
    Fix for bug #7100: relay_log_space_max missing from SHOW VARIABLES

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	gluh
# Host:	gluh.mysql.r18.ru
# Root:	/home/gluh/MySQL-MERGE/mysql-4.1

--- 1.161/sql/set_var.cc	Tue Mar 15 04:09:38 2005
+++ 1.162/sql/set_var.cc	Wed Mar 16 15:57:51 2005
@@ -845,6 +845,7 @@
   {sys_read_rnd_buff_size.name,(char*) &sys_read_rnd_buff_size,	    SHOW_SYS},
 #ifdef HAVE_REPLICATION
   {sys_relay_log_purge.name,  (char*) &sys_relay_log_purge,         SHOW_SYS},
+  {"relay_log_space_limit",  (char*) &relay_log_space_limit,        SHOW_LONGLONG},
 #endif
   {sys_rpl_recovery_rank.name,(char*) &sys_rpl_recovery_rank,       SHOW_SYS},
   {"secure_auth",             (char*) &sys_secure_auth,             SHOW_SYS},

--- 1.11/mysql-test/r/rpl000005.result	Mon Jan  6 02:48:50 2003
+++ 1.12/mysql-test/r/rpl000005.result	Wed Mar 16 15:57:51 2005
@@ -4,6 +4,9 @@
 reset slave;
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
 start slave;
+SHOW VARIABLES LIKE 'relay_log_space_limit';
+Variable_name	Value
+relay_log_space_limit	0
 CREATE TABLE t1 (name varchar(64), age smallint(3));
 INSERT INTO  t1 SET name='Andy', age=31;
 INSERT t1 SET name='Jacob', age=2;

--- 1.12/mysql-test/t/rpl000005.test	Mon Jan  6 02:48:53 2003
+++ 1.13/mysql-test/t/rpl000005.test	Wed Mar 16 15:57:51 2005
@@ -1,5 +1,10 @@
 source include/master-slave.inc;
 
+#
+# Bug#7100 relay_log_space_max missing from SHOW VARIABLES
+#
+SHOW VARIABLES LIKE 'relay_log_space_limit';
+
 CREATE TABLE t1 (name varchar(64), age smallint(3));
 INSERT INTO  t1 SET name='Andy', age=31;
 INSERT t1 SET name='Jacob', age=2;