diff options
author | Georgi Kodinov <joro@sun.com> | 2009-01-30 15:44:49 +0200 |
---|---|---|
committer | Georgi Kodinov <joro@sun.com> | 2009-01-30 15:44:49 +0200 |
commit | 87eb2cb938382b545158987a1cc6bc170588db3a (patch) | |
tree | a6a00e2376ec5327aa29d5a5b2441a06f8d146d4 /mysql-test/t/subselect.test | |
parent | 093a6dd90e12ca41e7e415f57f5a91181bf1959e (diff) | |
parent | f7a24d72dc7a86341da4634f6d1a71f1ea77000b (diff) | |
download | mariadb-git-87eb2cb938382b545158987a1cc6bc170588db3a.tar.gz |
merged 5.1-main -> 5.1-bugteam
Diffstat (limited to 'mysql-test/t/subselect.test')
-rw-r--r-- | mysql-test/t/subselect.test | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/mysql-test/t/subselect.test b/mysql-test/t/subselect.test index b625d49415d..9dcb645b28d 100644 --- a/mysql-test/t/subselect.test +++ b/mysql-test/t/subselect.test @@ -1041,13 +1041,14 @@ DROP TABLE t1; create table t1 (a int, b decimal(13, 3)); insert into t1 values (1, 0.123); -let $outfile = $MYSQLTEST_VARDIR/master-data/test/subselect.out.file.1; +let $outfile_abs= $MYSQLTEST_VARDIR/tmp/subselect.out.file.1; +let $outfile_rel= ../../tmp/subselect.out.file.1; --error 0,1 ---remove_file $outfile -select a, (select max(b) from t1) into outfile "subselect.out.file.1" from t1; +--remove_file $outfile_abs +eval select a, (select max(b) from t1) into outfile "$outfile_rel" from t1; delete from t1; -load data infile "subselect.out.file.1" into table t1; ---remove_file $outfile +eval load data infile "$outfile_rel" into table t1; +--remove_file $outfile_abs select * from t1; drop table t1; |