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

@@ -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

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;