Post-merge: Update test results

mysql-test/r/grant5.result

@@ -4,6 +4,7 @@ create user test;
 create user foo;
 create role foo;
 grant foo to test;
+connect  conn_1, localhost, test,,;
 set role foo;
 show grants for test;
 Grants for test@%
@@ -14,5 +15,6 @@ Grants for foo
 GRANT USAGE ON *.* TO 'foo'
 show grants for foo@'%';
 ERROR 42000: Access denied for user 'test'@'%' to database 'mysql'
+connection default;
 drop user test, foo;
 drop role foo;

mysql-test/r/ssl_timeout-9836.result

+connect con1,localhost,root,,,,,SSL;
 SET @@net_read_timeout=1;
 SELECT 1;
 1
@@ -5,3 +6,4 @@ SELECT 1;
 SELECT 1;
 1
 1
+disconnect con1;

mysql-test/r/wait_timeout_not_windows.result

 set global log_warnings=2;
+connect  foo,localhost,root;
 set @@wait_timeout=1;
+connection default;
 FOUND /Aborted.*Got timeout reading communication packets/ in mysqld.1.err
 set global log_warnings=@@log_warnings;

mysql-test/suite/binlog/r/binlog_mdev717.result

 RESET MASTER;
+connect con1,localhost,root;
+connection default;
 CREATE DATABASE mysqltest;
 SET DEBUG_SYNC= "after_wait_locked_schema_name SIGNAL locked WAIT_FOR release";
 DROP DATABASE mysqltest;;
+connection con1;
 SET DEBUG_SYNC= "now WAIT_FOR locked";
 SET DEBUG_SYNC= "before_wait_locked_pname SIGNAL release";
 CREATE FUNCTION mysqltest.f1() RETURNS INT RETURN 1;
 ERROR 42000: Unknown database 'mysqltest'
+connection default;
 CREATE DATABASE mysqltest;
 SET DEBUG_SYNC= "after_wait_locked_schema_name SIGNAL locked WAIT_FOR release";
 DROP DATABASE mysqltest;;
+connection con1;
 SET DEBUG_SYNC= "now WAIT_FOR locked";
 SET DEBUG_SYNC= "before_wait_locked_pname SIGNAL release";
 CREATE EVENT mysqltest.e1 ON SCHEDULE EVERY 15 MINUTE DO BEGIN END;
 ERROR 42000: Unknown database 'mysqltest'
+connection default;
 CREATE DATABASE mysqltest;
 CREATE EVENT mysqltest.e1 ON SCHEDULE EVERY 15 MINUTE DO BEGIN END;
 SET DEBUG_SYNC= "after_wait_locked_schema_name SIGNAL locked WAIT_FOR release";
 DROP DATABASE mysqltest;;
+connection con1;
 SET DEBUG_SYNC= "now WAIT_FOR locked";
 SET DEBUG_SYNC= "before_wait_locked_pname SIGNAL release";
 ALTER EVENT mysqltest.e1 ON SCHEDULE EVERY 20 MINUTE DO BEGIN END;
 ERROR 42000: Unknown database 'mysqltest'
+connection default;
 SET DEBUG_SYNC= "RESET";
 include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info

mysql-test/suite/funcs_1/r/processlist_priv_ps.result

@@ -60,7 +60,7 @@ INSERT INTO processlist SELECT * FROM test.t_processlist;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
 DROP TABLE test.t_processlist;
 CREATE VIEW test.v_processlist (ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO, TIME_MS, STAGE, MAX_STAGE, PROGRESS, MEMORY_USED, EXAMINED_ROWS, QUERY_ID, INFO_BINARY) AS SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO, TIME_MS, STAGE, MAX_STAGE, PROGRESS, MEMORY_USED, EXAMINED_ROWS, QUERY_ID, INFO_BINARY FROM processlist WITH CHECK OPTION;
-ERROR HY000: CHECK OPTION on non-updatable view 'test.v_processlist'
+ERROR HY000: CHECK OPTION on non-updatable view `test`.`v_processlist`
 CREATE VIEW test.v_processlist (ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO, TIME_MS, STAGE, MAX_STAGE, PROGRESS, MEMORY_USED, EXAMINED_ROWS, QUERY_ID, INFO_BINARY) AS SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO, TIME_MS, STAGE, MAX_STAGE, PROGRESS, MEMORY_USED, EXAMINED_ROWS, QUERY_ID, INFO_BINARY FROM processlist;
 DROP VIEW test.v_processlist;
 UPDATE processlist SET user='any_user'  WHERE id=1 ;
@@ -136,7 +136,7 @@ INSERT INTO processlist SELECT * FROM test.t_processlist;
 ERROR 42000: Access denied for user 'ddicttestuser1'@'localhost' to database 'information_schema'
 DROP TABLE test.t_processlist;
 CREATE VIEW test.v_processlist (ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO, TIME_MS, STAGE, MAX_STAGE, PROGRESS, MEMORY_USED, EXAMINED_ROWS, QUERY_ID, INFO_BINARY) AS SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO, TIME_MS, STAGE, MAX_STAGE, PROGRESS, MEMORY_USED, EXAMINED_ROWS, QUERY_ID, INFO_BINARY FROM processlist WITH CHECK OPTION;
-ERROR HY000: CHECK OPTION on non-updatable view 'test.v_processlist'
+ERROR HY000: CHECK OPTION on non-updatable view `test`.`v_processlist`
 CREATE VIEW test.v_processlist (ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO, TIME_MS, STAGE, MAX_STAGE, PROGRESS, MEMORY_USED, EXAMINED_ROWS, QUERY_ID, INFO_BINARY) AS SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO, TIME_MS, STAGE, MAX_STAGE, PROGRESS, MEMORY_USED, EXAMINED_ROWS, QUERY_ID, INFO_BINARY FROM processlist;
 DROP VIEW test.v_processlist;
 UPDATE processlist SET user='any_user'  WHERE id=1 ;

mysql-test/suite/innodb/r/defrag_mdl-9155.result

@@ -4,12 +4,15 @@ insert t1 select null, repeat('a', 256) from seq_1_to_100;
 select count(*) from t1;
 count(*)
 100
+connect  con1,localhost,root;
 start transaction;
 select count(*) from t1;
 count(*)
 100
+connection default;
 optimize table t1;
 Table	Op	Msg_type	Msg_text
 test.t1	optimize	status	OK
+connection con1;
 drop table t1;
 set global innodb_defragment=default;

mysql-test/suite/roles/rpl_grant_revoke_current_role-8638.result

@@ -6,16 +6,3 @@ grant select on db.* to current_role;
 revoke all privileges, grant option from current_role;
 drop role r1;
 include/rpl_end.inc
-connection server_2;
-connection server_2;
-connection server_2;
-connection server_2;
-connection server_1;
-connection server_1;
-connection server_1;
-connection server_2;
-connection server_1;
-connection server_2;
-connection server_2;
-connection server_1;
-connection server_1;

mysql-test/suite/roles/set_role-simple.result

@@ -46,6 +46,7 @@ delete from mysql.roles_mapping where Role='test_role1';
 flush privileges;
 drop user 'test_user'@'localhost';
 create user user1;
+connect  con1,localhost,user1,,;
 select current_user;
 current_user
 user1@%
@@ -53,4 +54,5 @@ show grants;
 Grants for user1@%
 GRANT USAGE ON *.* TO 'user1'@'%'
 set role none;
+connection default;
 drop user user1;

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

 include/master-slave.inc
 [connection master]
+connection master;
 CREATE TEMPORARY TABLE temp_t1 (c1 INT) ENGINE=InnoDB;
 CREATE TEMPORARY TABLE temp_t2 (c1 INT) ENGINE=MyISAM;
 CREATE TABLE t1 LIKE temp_t1;
 CREATE TABLE t2 LIKE temp_t2;
+connection slave;
+connection master;
 include/assert.inc ["t1 on master and temp_t1 have the same storage engine"]
 include/assert.inc ["t2 on master and temp_t2 have the same storage engine"]
+connection slave;
 include/assert.inc ["t1 on slave and temp_t1 have the same storage engine"]
 include/assert.inc ["t2 on slave and temp_t2 have the same storage engine"]
+connection master;
 DROP TEMPORARY TABLE temp_t1, temp_t2;
 DROP TABLE t1, t2;
 include/rpl_end.inc