summaryrefslogtreecommitdiff
path: root/mysql-test/t/loaddata.test
diff options
context:
space:
mode:
authorgshchepa/uchum@gleb.loc <>2007-07-04 03:15:37 +0500
committergshchepa/uchum@gleb.loc <>2007-07-04 03:15:37 +0500
commit79622efe7c6f84f0347456f5c05326239e042c48 (patch)
tree98a3173866ade707aa18edb343afc219fd635ecc /mysql-test/t/loaddata.test
parent4269994622f52e2b8b6d7f2f8b03088744e0d620 (diff)
downloadmariadb-git-79622efe7c6f84f0347456f5c05326239e042c48.tar.gz
loaddata.result, loaddata.test:
Updated test case for bug #29294.
Diffstat (limited to 'mysql-test/t/loaddata.test')
-rw-r--r--mysql-test/t/loaddata.test14
1 files changed, 7 insertions, 7 deletions
diff --git a/mysql-test/t/loaddata.test b/mysql-test/t/loaddata.test
index c7f16fc303b..cdd3bb80b6e 100644
--- a/mysql-test/t/loaddata.test
+++ b/mysql-test/t/loaddata.test
@@ -89,17 +89,17 @@ INSERT INTO t1 (c1) VALUES
('.r.'), ('.rr.'), ('.rrr.'), ('.rrrr.');
SELECT * FROM t1;
---exec rm -f $MYSQL_TEST_DIR/var/tmp/t1
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
-eval SELECT * INTO OUTFILE '$MYSQL_TEST_DIR/var/tmp/t1' FIELDS ENCLOSED BY 'r' FROM t1;
---exec cat $MYSQL_TEST_DIR/var/tmp/t1
+--exec rm -f $MYSQLTEST_VARDIR/tmp/t1
+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
+eval SELECT * INTO OUTFILE '$MYSQLTEST_VARDIR/tmp/t1' FIELDS ENCLOSED BY 'r' FROM t1;
+--exec cat $MYSQLTEST_VARDIR/tmp/t1
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
-eval LOAD DATA INFILE '$MYSQL_TEST_DIR/var/tmp/t1' INTO TABLE t2 FIELDS ENCLOSED BY 'r';
+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
+eval LOAD DATA INFILE '$MYSQLTEST_VARDIR/tmp/t1' INTO TABLE t2 FIELDS ENCLOSED BY 'r';
SELECT t1.id, c1, c2 FROM t1 LEFT JOIN t2 ON t1.id=t2.id WHERE c1 != c2;
SELECT t1.id, c1, c2 FROM t1 RIGHT JOIN t2 ON t1.id=t2.id WHERE c1 != c2;
---exec rm $MYSQL_TEST_DIR/var/tmp/t1
+--exec rm $MYSQLTEST_VARDIR/tmp/t1
DROP TABLE t1,t2;
# End of 4.1 tests