mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-15 19:37:16 +02:00
Code Issues Projects Releases Packages Wiki Activity

Post-merge fixes.

Browse source 
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.
This commit is contained in:
Sven Sandberg 2008-07-07 14:20:08 +02:00
commit 1fc4954d30
2 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
mysql-test/r/subselect.result
View file

@ -1658,9 +1658,9 @@ SELECT DISTINCT (SELECT a) FROM t1 LIMIT 100;
DROP TABLE t1; DROP TABLE t1;
create table t1 (a int, b decimal(13, 3)); create table t1 (a int, b decimal(13, 3));
insert into t1 values (1, 0.123); 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; 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; select * from t1;
a b a b
1 0.123 1 0.123

11
mysql-test/t/subselect.test
View file

@ -1041,13 +1041,14 @@ DROP TABLE t1;
create table t1 (a int, b decimal(13, 3)); create table t1 (a int, b decimal(13, 3));
insert into t1 values (1, 0.123); 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 --error 0,1
--remove_file $outfile --remove_file $outfile_abs
select a, (select max(b) from t1) into outfile "subselect.out.file.1" from t1; eval select a, (select max(b) from t1) into outfile "$outfile_rel" from t1;
delete from t1; delete from t1;
load data infile "subselect.out.file.1" into table t1; eval load data infile "$outfile_rel" into table t1;
--remove_file $outfile --remove_file $outfile_abs
select * from t1; select * from t1;
drop table t1; drop table t1;