mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
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.
This commit is contained in:
@ -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
|
||||
|
Reference in New Issue
Block a user