diff options
| author | Georgi Kodinov <kgeorge@mysql.com> | 2008-10-01 12:52:51 +0300 |
|---|---|---|
| committer | Georgi Kodinov <kgeorge@mysql.com> | 2008-10-01 12:52:51 +0300 |
| commit | 7c0e7cdb03ac19ecfbc497d1de5219c5bf9af619 (patch) | |
| tree | 924303d75cafcf56f9055e68404f6c859f6a6b54 /mysql-test/t/distinct.test | |
| parent | 63a3ce6ef0f75440dd21ec13925c16d475ca37e6 (diff) | |
| parent | ab5b7ceb971896ee73fa6187e894cb6ef2a36595 (diff) | |
| download | mariadb-git-7c0e7cdb03ac19ecfbc497d1de5219c5bf9af619.tar.gz | |
merged 5.0-bugteam -> 5.1-bugteam
Diffstat (limited to 'mysql-test/t/distinct.test')
| -rw-r--r-- | mysql-test/t/distinct.test | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/t/distinct.test b/mysql-test/t/distinct.test index 7fdad40684c..5be8d911881 100644 --- a/mysql-test/t/distinct.test +++ b/mysql-test/t/distinct.test @@ -491,12 +491,12 @@ SELECT DISTINCT fruit_id, fruit_name INTO OUTFILE '../tmp/data1.tmp' FROM t1 WHERE fruit_name = 'APPLE'; LOAD DATA INFILE '../tmp/data1.tmp' INTO TABLE t2; --error 0,1 ---remove_file $MYSQL_TEST_DIR/var/tmp/data1.tmp +--remove_file $MYSQLTEST_VARDIR/tmp/data1.tmp SELECT DISTINCT @v19:= fruit_id, @v20:= fruit_name INTO OUTFILE '../tmp/data2.tmp' FROM t1 WHERE fruit_name = 'APPLE'; LOAD DATA INFILE '../tmp/data2.tmp' INTO TABLE t2; ---remove_file $MYSQL_TEST_DIR/var/tmp/data2.tmp +--remove_file $MYSQLTEST_VARDIR/tmp/data2.tmp SELECT @v19, @v20; SELECT * FROM t2; |