diff options
| author | Sven Sandberg <sven@mysql.com> | 2008-07-07 14:20:08 +0200 |
|---|---|---|
| committer | Sven Sandberg <sven@mysql.com> | 2008-07-07 14:20:08 +0200 |
| commit | 1fc4954d30ae36788ae0ad3bec40e2b70ab4d7d1 (patch) | |
| tree | 05ff5b7876315e72c0004f04b2ea3438429af437 /mysql-test/r/subselect.result | |
| parent | 1bcd20bf7c11a3687f337ea8bb008136f1e52e1e (diff) | |
| download | mariadb-git-1fc4954d30ae36788ae0ad3bec40e2b70ab4d7d1.tar.gz | |
Post-merge fixes.
The file tree in mtr's vardir has changed so an old
hard-coded path in mysql-test/t/subselect.test didn't
work.
Fix: update the paths in the test.
mysql-test/r/subselect.result:
Updated result file.
mysql-test/t/subselect.test:
Problem: The file tree in mtr's vardir has changed
so an old hard-coded path didn't work.
Fix: update the paths in the test.
Diffstat (limited to 'mysql-test/r/subselect.result')
| -rw-r--r-- | mysql-test/r/subselect.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/subselect.result b/mysql-test/r/subselect.result index 923bc2254bd..16d7cb65059 100644 --- a/mysql-test/r/subselect.result +++ b/mysql-test/r/subselect.result @@ -1658,9 +1658,9 @@ SELECT DISTINCT (SELECT a) FROM t1 LIMIT 100; DROP TABLE t1; create table t1 (a int, b decimal(13, 3)); insert into t1 values (1, 0.123); -select a, (select max(b) from t1) into outfile "subselect.out.file.1" from t1; +select a, (select max(b) from t1) into outfile "../../tmp/subselect.out.file.1" from t1; delete from t1; -load data infile "subselect.out.file.1" into table t1; +load data infile "../../tmp/subselect.out.file.1" into table t1; select * from t1; a b 1 0.123 |