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.

mysql-test/extra/rpl_tests/rpl_log.test

@@ -126,9 +126,13 @@ DROP TABLE t3;
 # Bug #6880: LAST_INSERT_ID() within a statement
 #
 
+# Reset binlog so that show binlog events will not show the tests
+# above.
+source include/master-slave-reset.inc;
+connection master;
+
 create table t1(a int auto_increment primary key, b int);
 insert into t1 values (NULL, 1);
-reset master;
 set insert_id=5;
 insert into t1 values (NULL, last_insert_id()), (NULL, last_insert_id());
 source include/show_binlog_events.inc;
@@ -138,4 +142,3 @@ drop table t1;
 # End of 4.1 tests
 
 sync_slave_with_master;
-drop table t1;

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

mysql-test/r/log_basic.result

@@ -17,3 +17,5 @@ WHERE VARIABLE_NAME='log';
 VARIABLE_VALUE
 OFF
 SET @@global.log= @start_log;
+Warnings:
+Warning	1287	The syntax '@@log' is deprecated and will be removed in MySQL 7.0. Please use '@@general_log' instead

mysql-test/r/mysql_upgrade.result

 Run mysql_upgrade once
-mtr.global_suppressions                            OK
+mtr.global_supressions                             OK
 mtr.suspicious_patterns                            OK
-mtr.test_suppressions                              OK
+mtr.test_supressions                               OK
 mysql.columns_priv                                 OK
 mysql.db                                           OK
 mysql.event                                        OK
@@ -32,9 +32,9 @@ mysql.user                                         OK
 Run it again - should say already completed
 This installation of MySQL is already upgraded to VERSION, use --force if you still need to run mysql_upgrade
 Force should run it regardless of wether it's been run before
-mtr.global_suppressions                            OK
+mtr.global_supressions                             OK
 mtr.suspicious_patterns                            OK
-mtr.test_suppressions                              OK
+mtr.test_supressions                               OK
 mysql.columns_priv                                 OK
 mysql.db                                           OK
 mysql.event                                        OK
@@ -65,9 +65,9 @@ mysql.user                                         OK
 CREATE USER mysqltest1@'%' IDENTIFIED by 'sakila';
 GRANT ALL ON *.* TO mysqltest1@'%';
 Run mysql_upgrade with password protected account
-mtr.global_suppressions                            OK
+mtr.global_supressions                             OK
 mtr.suspicious_patterns                            OK
-mtr.test_suppressions                              OK
+mtr.test_supressions                               OK
 mysql.columns_priv                                 OK
 mysql.db                                           OK
 mysql.event                                        OK
@@ -97,12 +97,12 @@ mysql.time_zone_transition_type                    OK
 mysql.user                                         OK
 DROP USER mysqltest1@'%';
 Run mysql_upgrade with a non existing server socket
-mysqlcheck: Got error: 2005: Unknown MySQL server host 'not_existing_host' (errno) when trying to connect
+mysqlcheck: Got error: 2003: Can't connect to MySQL server on 'not_existing_host' (errno) when trying to connect
 FATAL ERROR: Upgrade failed
 set GLOBAL sql_mode='STRICT_ALL_TABLES,ANSI_QUOTES,NO_ZERO_DATE';
-mtr.global_suppressions                            OK
+mtr.global_supressions                             OK
 mtr.suspicious_patterns                            OK
-mtr.test_suppressions                              OK
+mtr.test_supressions                               OK
 mysql.columns_priv                                 OK
 mysql.db                                           OK
 mysql.event                                        OK

mysql-test/suite/federated/federated.result

@@ -2133,4 +2133,3 @@ DROP TABLE IF EXISTS federated.t1;
 DROP DATABASE IF EXISTS federated;
 DROP TABLE IF EXISTS federated.t1;
 DROP DATABASE IF EXISTS federated;
-SET @@GLOBAL.CONCURRENT_INSERT= @OLD_CONCURRENT_INSERT;

mysql-test/suite/federated/federated.test

@@ -6,7 +6,7 @@
 
 # should work with embedded server after mysqltest is fixed
 --source include/not_embedded.inc
---source include/federated.inc
+--source federated.inc
 
 connection default;
 
@@ -1936,4 +1936,4 @@ connection slave;
 SET @@GLOBAL.CONCURRENT_INSERT= @OLD_SLAVE_CONCURRENT_INSERT;
 
 connection default;
-source include/federated_cleanup.inc;
+source federated_cleanup.inc;

mysql-test/suite/federated/federated_bug_25714.test

@@ -60,6 +60,3 @@ SET @@GLOBAL.CONCURRENT_INSERT= @OLD_SLAVE_CONCURRENT_INSERT;
 
 
 source federated_cleanup.inc;
-
-connection default;
-SET @@GLOBAL.CONCURRENT_INSERT= @OLD_CONCURRENT_INSERT;

mysql-test/suite/rpl/r/rpl_row_log.result

@@ -288,13 +288,23 @@ ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Could not find tar
 DROP TABLE t1;
 DROP TABLE t2;
 DROP TABLE t3;
+stop slave;
+drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
+reset master;
+reset slave;
+drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
+start slave;
 create table t1(a int auto_increment primary key, b int);
 insert into t1 values (NULL, 1);
-reset master;
 set insert_id=5;
 insert into t1 values (NULL, last_insert_id()), (NULL, last_insert_id());
 show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Query	#	#	use `test`; create table t1(a int auto_increment primary key, b int)
+master-bin.000001	#	Query	#	#	use `test`; BEGIN
+master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
+master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Query	#	#	use `test`; COMMIT
 master-bin.000001	#	Query	#	#	use `test`; BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
 master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
@@ -305,4 +315,3 @@ a	b
 5	1
 6	1
 drop table t1;
-drop table t1;

mysql-test/suite/rpl/r/rpl_row_log_innodb.result

@@ -288,13 +288,23 @@ ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Could not find tar
 DROP TABLE t1;
 DROP TABLE t2;
 DROP TABLE t3;
+stop slave;
+drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
+reset master;
+reset slave;
+drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
+start slave;
 create table t1(a int auto_increment primary key, b int);
 insert into t1 values (NULL, 1);
-reset master;
 set insert_id=5;
 insert into t1 values (NULL, last_insert_id()), (NULL, last_insert_id());
 show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Query	#	#	use `test`; create table t1(a int auto_increment primary key, b int)
+master-bin.000001	#	Query	#	#	use `test`; BEGIN
+master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
+master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Query	#	#	use `test`; COMMIT
 master-bin.000001	#	Query	#	#	use `test`; BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
 master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
@@ -305,4 +315,3 @@ a	b
 5	1
 6	1
 drop table t1;
-drop table t1;

mysql-test/suite/rpl/r/rpl_stm_log.result

@@ -270,13 +270,21 @@ ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Could not find tar
 DROP TABLE t1;
 DROP TABLE t2;
 DROP TABLE t3;
+stop slave;
+drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
+reset master;
+reset slave;
+drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
+start slave;
 create table t1(a int auto_increment primary key, b int);
 insert into t1 values (NULL, 1);
-reset master;
 set insert_id=5;
 insert into t1 values (NULL, last_insert_id()), (NULL, last_insert_id());
 show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Query	#	#	use `test`; create table t1(a int auto_increment primary key, b int)
+master-bin.000001	#	Intvar	#	#	INSERT_ID=1
+master-bin.000001	#	Query	#	#	use `test`; insert into t1 values (NULL, 1)
 master-bin.000001	#	Intvar	#	#	LAST_INSERT_ID=1
 master-bin.000001	#	Intvar	#	#	INSERT_ID=5
 master-bin.000001	#	Query	#	#	use `test`; insert into t1 values (NULL, last_insert_id()), (NULL, last_insert_id())
@@ -286,4 +294,3 @@ a	b
 5	1
 6	1
 drop table t1;
-drop table t1;

mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test

@@ -127,7 +127,7 @@ INSERT INTO t1(b,c) VALUES('A',3);
 INSERT INTO t1(b,c) VALUES('B',3);
 --connection master_d
 INSERT INTO t1(b,c) VALUES('D',3);
---connection master_a  
+connection master_a;
 
 --sync_slave_with_master master_b
 --sync_slave_with_master master_d

mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result

@@ -117,7 +117,6 @@ Aberdeen
 Abernathy
 aberrant
 aberration
-include/start_slave.inc
 select * from t1 order by 1 asc;
 word
 Aarhus
@@ -305,13 +304,23 @@ ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Could not find tar
 DROP TABLE t1;
 DROP TABLE t2;
 DROP TABLE t3;
+stop slave;
+drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
+reset master;
+reset slave;
+drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
+start slave;
 create table t1(a int auto_increment primary key, b int);
 insert into t1 values (NULL, 1);
-reset master;
 set insert_id=5;
 insert into t1 values (NULL, last_insert_id()), (NULL, last_insert_id());
 show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Query	#	#	use `test`; create table t1(a int auto_increment primary key, b int)
+master-bin.000001	#	Query	#	#	use `test`; BEGIN
+master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
+master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Query	#	#	use `test`; COMMIT
 master-bin.000001	#	Query	#	#	use `test`; BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
 master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F

mysql-test/t/distinct.test

@@ -487,14 +487,14 @@ 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;
 --error 0,1
 --remove_file $MYSQLTEST_VARDIR/tmp/data1.tmp
 
 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;
 --remove_file $MYSQLTEST_VARDIR/tmp/data2.tmp
 
 SELECT @v19, @v20;