diff options
| author | msvensson@neptunus.(none) <> | 2006-01-24 08:43:34 +0100 |
|---|---|---|
| committer | msvensson@neptunus.(none) <> | 2006-01-24 08:43:34 +0100 |
| commit | 3d5f530caa081c228c89084b8ce86bef76c9f2c0 (patch) | |
| tree | 3fdef573e0d5e1e1b95312a537e0fefad513d30d /mysql-test/include | |
| parent | 86cb9bf94dc49db0824f389e7e81233b54e5b52c (diff) | |
| parent | 09ec2919a1f7b2ef65623ecf62014210f7d74fac (diff) | |
| download | mariadb-git-3d5f530caa081c228c89084b8ce86bef76c9f2c0.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysqltest_var/my50-mysqltest_var
into neptunus.(none):/home/msvensson/mysql/mysqltest_var/my50-mysqltest_var-integration
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"; |