Merge mysql.com:/usr/home/ram/work/mysql-5.0-build

into mysql.com:/usr/home/ram/work/mysql-5.0

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

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

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