diff options
| author | Mats Kindahl <mats@sun.com> | 2008-10-29 18:38:18 +0100 |
|---|---|---|
| committer | Mats Kindahl <mats@sun.com> | 2008-10-29 18:38:18 +0100 |
| commit | 1f6e419d799c95aba1146f0e26522331ae28cf3c (patch) | |
| tree | 6ab2275b41577e6aa010075c5f0e6f5ca1f6e6b3 /mysql-test/r/distinct.result | |
| parent | abe177349b1cc21f33ba837a3a77bf67d350452e (diff) | |
| download | mariadb-git-1f6e419d799c95aba1146f0e26522331ae28cf3c.tar.gz | |
Post-merge fixes to fix test cases.
mysql-test/extra/rpl_tests/rpl_log.test:
Using RESET MASTER in the middle of a sequence of statements cause
a race condition between the dump thread sending the preceeding
statements to the slave and the RESET MASTER.
mysql-test/suite/federated/federated.test:
Fixing include paths.
mysql-test/suite/federated/federated_bug_25714.test:
Removing extreneous lines added by merge.
mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test:
Correcting typo (the spaces following the connection name was included as part of the name).
mysql-test/t/distinct.test:
Correcting paths.
Diffstat (limited to 'mysql-test/r/distinct.result')
| -rw-r--r-- | mysql-test/r/distinct.result | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/r/distinct.result b/mysql-test/r/distinct.result index 6a06a9661aa..f71bbd175e3 100644 --- a/mysql-test/r/distinct.result +++ b/mysql-test/r/distinct.result @@ -653,11 +653,11 @@ DROP TABLE IF EXISTS t2; CREATE TABLE t2 (fruit_id INT NOT NULL, fruit_name varchar(20) default NULL); 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; +'../../tmp/data1.tmp' FROM t1 WHERE fruit_name = 'APPLE'; +LOAD DATA INFILE '../../tmp/data1.tmp' INTO TABLE t2; 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; +'../../tmp/data2.tmp' FROM t1 WHERE fruit_name = 'APPLE'; +LOAD DATA INFILE '../../tmp/data2.tmp' INTO TABLE t2; SELECT @v19, @v20; @v19 @v20 2 APPLE |