diff options
| -rw-r--r-- | mysql-test/r/rpl_variables.result | 2 | ||||
| -rw-r--r-- | mysql-test/t/rpl_variables.test | 2 | ||||
| -rw-r--r-- | scripts/make_binary_distribution.sh | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/r/rpl_variables.result b/mysql-test/r/rpl_variables.result index b6da7f76a6d..25b5ca13f77 100644 --- a/mysql-test/r/rpl_variables.result +++ b/mysql-test/r/rpl_variables.result @@ -11,7 +11,7 @@ Variable_name Value 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 diff --git a/mysql-test/t/rpl_variables.test b/mysql-test/t/rpl_variables.test index a4a6e69c845..ea40181ecd3 100644 --- a/mysql-test/t/rpl_variables.test +++ b/mysql-test/t/rpl_variables.test @@ -5,7 +5,7 @@ set global sql_slave_skip_counter=100; # 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 diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh index 1f28b8e4538..d273e67ec01 100644 --- a/scripts/make_binary_distribution.sh +++ b/scripts/make_binary_distribution.sh @@ -315,8 +315,8 @@ system=`echo $system | sed -e 's/solaris2.\([0-9]*\)/solaris\1/g'` system=`echo $system | sed -e 's/sco3.2v\(.*\)/openserver\1/g'` # Use the override --machine if present -if [ $MACHINE != "" ] ; then - machine= $MACHINE +if [ -n $MACHINE ] ; then + machine=$MACHINE fi # Change the distribution to a long descriptive name |