Update testcase post merge

mysql-test/suite/parts/r/partition_exch_qa_6.result

@@ -56,6 +56,7 @@ CREATE TABLE tsp_04(a INT,b VARCHAR(55),PRIMARY KEY (a)) ENGINE = MYISAM   AS SE
 CREATE TABLE tsp_00(a INT,b VARCHAR(55),PRIMARY KEY (a)) ENGINE = MYISAM   AS SELECT a, b FROM t_10 WHERE MOD(a,5)= 0;
 GRANT USAGE ON *.* TO test2@localhost;
 GRANT CREATE, DROP, ALTER, UPDATE, INSERT, SELECT ON test.* TO test2@localhost;
+connect  test2,localhost,test2,,test,$MASTER_MYPORT,$MASTER_MYSOCK;
 SHOW GRANTS FOR CURRENT_USER;
 Grants for test2@localhost
 GRANT USAGE ON *.* TO 'test2'@'localhost'
@@ -106,7 +107,10 @@ a	b
 4	Four
 6	Six
 8	Eight
+disconnect test2;
+connection default;
 REVOKE INSERT ON test.* FROM test2@localhost;
+connect  test2,localhost,test2,,test,$MASTER_MYPORT,$MASTER_MYSOCK;
 USE test;
 SHOW GRANTS FOR CURRENT_USER;
 Grants for test2@localhost
@@ -114,8 +118,11 @@ GRANT USAGE ON *.* TO 'test2'@'localhost'
 GRANT SELECT, UPDATE, CREATE, DROP, ALTER ON `test`.* TO 'test2'@'localhost'
 ALTER TABLE tp EXCHANGE PARTITION p0 WITH TABLE t_10;
 ERROR 42000: INSERT command denied to user 'test2'@'localhost' for table 'tp'
+disconnect test2;
+connection default;
 GRANT INSERT ON test.* TO test2@localhost;
 REVOKE CREATE ON test.* FROM test2@localhost;
+connect  test2,localhost,test2,,test,$MASTER_MYPORT,$MASTER_MYSOCK;
 USE test;
 SHOW GRANTS FOR CURRENT_USER;
 Grants for test2@localhost
@@ -123,14 +130,19 @@ GRANT USAGE ON *.* TO 'test2'@'localhost'
 GRANT SELECT, INSERT, UPDATE, DROP, ALTER ON `test`.* TO 'test2'@'localhost'
 ALTER TABLE tsp EXCHANGE PARTITION sp00 WITH TABLE tsp_00;
 ERROR 42000: CREATE command denied to user 'test2'@'localhost' for table 'tsp'
+disconnect test2;
+connection default;
 GRANT CREATE ON test.* TO test2@localhost;
 REVOKE DROP ON test.* FROM test2@localhost;
+connect  test2,localhost,test2,,test,$MASTER_MYPORT,$MASTER_MYSOCK;
 SHOW GRANTS FOR CURRENT_USER;
 Grants for test2@localhost
 GRANT USAGE ON *.* TO 'test2'@'localhost'
 GRANT SELECT, INSERT, UPDATE, CREATE, ALTER ON `test`.* TO 'test2'@'localhost'
 ALTER TABLE tp EXCHANGE PARTITION p0 WITH TABLE t_10;
 ERROR 42000: DROP command denied to user 'test2'@'localhost' for table 'tp'
+disconnect test2;
+connection default;
 DROP TABLE IF EXISTS t_10;
 DROP TABLE IF EXISTS t_100;
 DROP TABLE IF EXISTS t_1000;

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

@@ -3,6 +3,7 @@ include/master-slave.inc
 #
 # MDEV-13685 Can not replay binary log due to Illegal mix of collations (latin1_swedish_ci,IMPLICIT) and (utf8mb4_general_ci,COERCIBLE) for operation 'concat'
 #
+connection master;
 SET NAMES utf8;
 CREATE TABLE t1 (a VARCHAR(10) CHARACTER SET utf8);
 CREATE PROCEDURE p1()
@@ -15,10 +16,13 @@ CALL p1;
 SELECT * FROM t1;
 a
 2017오
+connection slave;
 SET NAMES utf8;
 SELECT * FROM t1;
 a
 2017오
+connection master;
 DROP PROCEDURE p1;
 DROP TABLE t1;
+connection slave;
 include/rpl_end.inc