Merge rt.int.sifira.dk:/usr/local/mysql/mysql-5.1-pristine

into  rt.int.sifira.dk:/usr/local/mysql/tmp-5.1

mysql-test/r/log_state.result

@@ -102,7 +102,7 @@ show variables like 'general_log_file';
 Variable_name	Value
 general_log_file	#
 set global general_log= OFF;
-set global general_log_file='/tmp/log.master';
+set global general_log_file='MYSQLTEST_VARDIR/tmp/log.master';
 set global general_log= ON;
 create table t1(f1 int);
 drop table t1;

mysql-test/t/log_state.test

@@ -80,7 +80,8 @@ set global general_log_file='';
 --replace_column 2 #
 show variables like 'general_log_file';
 set global general_log= OFF;
-set global general_log_file='/tmp/log.master';
+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
+eval set global general_log_file='$MYSQLTEST_VARDIR/tmp/log.master';
 set global general_log= ON;
 create table t1(f1 int);
 drop table t1;