bk commit into 5.0 tree (ramil:1.1847) BUG#10703

[ramil]

Below is the list of changes that have just been committed into a local
5.0 repository of ram. When ram 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.1847 05/05/18 13:47:51 ramil@stripped +2 -0
  A fix (bug #10703: rpl_variables.test failure).

  mysql-test/t/rpl_variables.test
    1.3 05/05/18 13:47:42 ramil@stripped +1 -1
    A fix (bug #10703: rpl_variables.test failure).
    "$SLAVE_LOAD_TMPDIR" may differ from the "$MYSQL_TEST_DIR/var/tmp".

  mysql-test/r/rpl_variables.result
    1.3 05/05/18 13:47:42 ramil@stripped +1 -1
    A fix (bug #10703: rpl_variables.test failure).
    "$SLAVE_LOAD_TMPDIR" may differ from the "$MYSQL_TEST_DIR/var/tmp".

# 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:	ramil
# Host:	gw.mysql.r18.ru
# Root:	/usr/home/ram/work/mysql-5.0

--- 1.2/mysql-test/r/rpl_variables.result	2005-05-07 15:21:04 +05:00
+++ 1.3/mysql-test/r/rpl_variables.result	2005-05-18 13:47:42 +05:00
@@ -11,7 +11,7 @@
 slave_compressed_protocol	OFF
 show variables like 'slave_load_tmpdir';
 Variable_name	Value
-slave_load_tmpdir	MYSQL_TEST_DIR/var/tmp/
+slave_load_tmpdir	SLAVE_LOAD_TMPDIR
 show variables like 'slave_skip_errors';
 Variable_name	Value
 slave_skip_errors	3,100,137,643,1752

--- 1.2/mysql-test/t/rpl_variables.test	2005-05-07 15:20:57 +05:00
+++ 1.3/mysql-test/t/rpl_variables.test	2005-05-18 13:47:42 +05:00
@@ -5,7 +5,7 @@
 
 # BUG #7800: Add various-slave related variables to SHOW VARIABLES
 show variables like 'slave_compressed_protocol';
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
+--replace_column 2 SLAVE_LOAD_TMPDIR
 show variables like 'slave_load_tmpdir';
 # We just set some arbitrary values in variables-master.opt so we can test
 # that a list of values works correctly