diff options
Diffstat (limited to 'mysql-test/include')
| -rw-r--r-- | mysql-test/include/have_outfile.inc | 2 | ||||
| -rw-r--r-- | mysql-test/include/sourced.inc | 1 | ||||
| -rw-r--r-- | mysql-test/include/sourced1.inc | 1 | ||||
| -rw-r--r-- | mysql-test/include/test_outfile.inc | 2 |
4 files changed, 4 insertions, 2 deletions
diff --git a/mysql-test/include/have_outfile.inc b/mysql-test/include/have_outfile.inc index 31e95f4810a..10f093ec3ef 100644 --- a/mysql-test/include/have_outfile.inc +++ b/mysql-test/include/have_outfile.inc @@ -1,5 +1,5 @@ -- require r/have_outfile.require disable_query_log; select load_file(concat(@tmpdir,"/outfile.test")); ---exec rm $MYSQL_TEST_DIR/var/tmp/outfile.test +--exec rm $MYSQLTEST_VARDIR/tmp/outfile.test enable_query_log; diff --git a/mysql-test/include/sourced.inc b/mysql-test/include/sourced.inc new file mode 100644 index 00000000000..be1a270641a --- /dev/null +++ b/mysql-test/include/sourced.inc @@ -0,0 +1 @@ +echo here is the sourced script; diff --git a/mysql-test/include/sourced1.inc b/mysql-test/include/sourced1.inc new file mode 100644 index 00000000000..920561e5de2 --- /dev/null +++ b/mysql-test/include/sourced1.inc @@ -0,0 +1 @@ +--source include/sourced.inc diff --git a/mysql-test/include/test_outfile.inc b/mysql-test/include/test_outfile.inc index 0bede4938c6..b67e67a4dd4 100644 --- a/mysql-test/include/test_outfile.inc +++ b/mysql-test/include/test_outfile.inc @@ -1 +1 @@ -eval select "Outfile OK" into outfile "$MYSQL_TEST_DIR/var/tmp/outfile.test"; +eval select "Outfile OK" into outfile "$MYSQLTEST_VARDIR/tmp/outfile.test"; |