summaryrefslogtreecommitdiff
path: root/mysql-test/include
diff options
context:
space:
mode:
authormonty@mysql.com <>2005-05-14 18:31:22 +0300
committermonty@mysql.com <>2005-05-14 18:31:22 +0300
commit9db45adb608d7f4229f026cfdbbcc185f58b8c7b (patch)
treec08ee86cd9f77c3a7dc13b02b09371ccd19f2b88 /mysql-test/include
parent6b90352eacab0314ad33ef4e0d37dadb4688fd97 (diff)
parent6588997eb8218233b664fbbb32b130e832387daa (diff)
downloadmariadb-git-9db45adb608d7f4229f026cfdbbcc185f58b8c7b.tar.gz
Merge with 4.1
Diffstat (limited to 'mysql-test/include')
-rw-r--r--mysql-test/include/have_outfile.inc5
-rw-r--r--mysql-test/include/test_outfile.inc1
2 files changed, 6 insertions, 0 deletions
diff --git a/mysql-test/include/have_outfile.inc b/mysql-test/include/have_outfile.inc
new file mode 100644
index 00000000000..31e95f4810a
--- /dev/null
+++ b/mysql-test/include/have_outfile.inc
@@ -0,0 +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
+enable_query_log;
diff --git a/mysql-test/include/test_outfile.inc b/mysql-test/include/test_outfile.inc
new file mode 100644
index 00000000000..0bede4938c6
--- /dev/null
+++ b/mysql-test/include/test_outfile.inc
@@ -0,0 +1 @@
+eval select "Outfile OK" into outfile "$MYSQL_TEST_DIR/var/tmp/outfile.test";