summaryrefslogtreecommitdiff
path: root/mysql-test/r/loaddata.result
diff options
context:
space:
mode:
authorunknown <gshchepa/uchum@gleb.loc>2007-07-04 03:15:37 +0500
committerunknown <gshchepa/uchum@gleb.loc>2007-07-04 03:15:37 +0500
commit8d035c57f0c5c65ecf9652bd913b3d2f988c8f6e (patch)
tree98a3173866ade707aa18edb343afc219fd635ecc /mysql-test/r/loaddata.result
parentc700a77623b790bf373795c80ac22cdced3a4076 (diff)
downloadmariadb-git-8d035c57f0c5c65ecf9652bd913b3d2f988c8f6e.tar.gz
loaddata.result, loaddata.test:
Updated test case for bug #29294. mysql-test/t/loaddata.test: Updated test case for bug #29294. mysql-test/r/loaddata.result: Updated test case for bug #29294.
Diffstat (limited to 'mysql-test/r/loaddata.result')
-rw-r--r--mysql-test/r/loaddata.result4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/loaddata.result b/mysql-test/r/loaddata.result
index 0aa95983264..031aa5c700c 100644
--- a/mysql-test/r/loaddata.result
+++ b/mysql-test/r/loaddata.result
@@ -117,7 +117,7 @@ id c1
14 .rr.
15 .rrr.
16 .rrrr.
-SELECT * INTO OUTFILE 'MYSQL_TEST_DIR/var/tmp/t1' FIELDS ENCLOSED BY 'r' FROM t1;
+SELECT * INTO OUTFILE 'MYSQLTEST_VARDIR/tmp/t1' FIELDS ENCLOSED BY 'r' FROM t1;
r1r rrrr
r2r rrrrrr
r3r rrrrrrrr
@@ -134,7 +134,7 @@ r13r r.rr.r
r14r r.rrrr.r
r15r r.rrrrrr.r
r16r r.rrrrrrrr.r
-LOAD DATA INFILE 'MYSQL_TEST_DIR/var/tmp/t1' INTO TABLE t2 FIELDS ENCLOSED BY 'r';
+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;
id c1 c2
SELECT t1.id, c1, c2 FROM t1 RIGHT JOIN t2 ON t1.id=t2.id WHERE c1 != c2;