diff options
| -rw-r--r-- | mysql-test/r/log_state.result | 2 | ||||
| -rw-r--r-- | mysql-test/t/log_state.test | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/mysql-test/r/log_state.result b/mysql-test/r/log_state.result index 43735243787..0547c5a5bbf 100644 --- a/mysql-test/r/log_state.result +++ b/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; diff --git a/mysql-test/t/log_state.test b/mysql-test/t/log_state.test index 41fbd068dce..6fc0f3421a7 100644 --- a/mysql-test/t/log_state.test +++ b/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; |