PS-9218: Merge MySQL 8.4.0 (MTR test fixes)

mysql-test/include/send_kill_to_mysqld.inc

@@ -22,7 +22,6 @@ if ($_kill_signal == '')
 --source include/expect_crash.inc
 
 # Kill the connected server
---disable_reconnect
 --let KILL_NODE_PIDFILE = `SELECT @@pid_file`
 --let KILL_SIGNAL = $_kill_signal
 --perl

mysql-test/suite/percona/include/binlog_utils_udf.inc

@@ -45,7 +45,7 @@ FLUSH BINARY LOGS;
 --let $stage = 1
 while($stage <= $number_of_stages)
 {
-  --let $binlog_file_name = query_get_value(SHOW MASTER STATUS, File, 1)
+  --let $binlog_file_name = query_get_value(SHOW BINARY LOG STATUS, File, 1)
 
   --let $substage = 1
   while($substage <= $number_of_substages)

mysql-test/suite/percona/include/percona_kill_idle_trx_non_trx_se.inc

@@ -2,6 +2,10 @@
 --echo # Tests for kill_idle_transaction feature that do not depend on transactional SEs
 --echo #
 
+--disable_query_log
+call mtr.add_suppression("IO-layer timeout before wait_timeout was reached");
+--enable_query_log
+
 CREATE TABLE t1 (a INT) ENGINE=MyISAM;
 
 let $saved_kill_idle_transaction= `SELECT @@kill_idle_transaction`;
@@ -24,9 +28,7 @@ sleep 2;
 
 --echo # Current connection idle transaction killed, reconnecting
 --source include/wait_until_disconnected.inc
---enable_reconnect
 --source include/wait_until_connected_again.inc
---disable_reconnect
 
 --echo # With a low wait_timeout and high kill_idle_transaction the lower value takes precedence
 SET GLOBAL kill_idle_transaction= 100000;
@@ -36,9 +38,7 @@ BEGIN;
 sleep 6;
 --echo # Current connection idle transaction killed, reconnecting
 --source include/wait_until_disconnected.inc
---enable_reconnect
 --source include/wait_until_connected_again.inc
---disable_reconnect
 
 --echo # Cleanup
 DROP TABLE t1;

mysql-test/suite/percona/r/bug74778.result

@@ -2,6 +2,6 @@ RENAME TABLE mysql.procs_priv TO procs_priv_backup;
 SHOW grants;
 Grants for root@localhost
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `root`@`localhost` WITH GRANT OPTION
-GRANT ALLOW_NONEXISTENT_DEFINER,APPLICATION_PASSWORD_ADMIN,AUDIT_ABORT_EXEMPT,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FIREWALL_EXEMPT,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SENSITIVE_VARIABLES_OBSERVER,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_ANY_DEFINER,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,TELEMETRY_LOG_ADMIN,TRANSACTION_GTID_TAG,XA_RECOVER_ADMIN ON *.* TO `root`@`localhost` WITH GRANT OPTION
+GRANT ALLOW_NONEXISTENT_DEFINER,APPLICATION_PASSWORD_ADMIN,AUDIT_ABORT_EXEMPT,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FIREWALL_EXEMPT,FLUSH_OPTIMIZER_COSTS,FLUSH_PRIVILEGES,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,OPTIMIZE_LOCAL_TABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SENSITIVE_VARIABLES_OBSERVER,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_ANY_DEFINER,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,TELEMETRY_LOG_ADMIN,TRANSACTION_GTID_TAG,XA_RECOVER_ADMIN ON *.* TO `root`@`localhost` WITH GRANT OPTION
 GRANT PROXY ON ``@`` TO `root`@`localhost` WITH GRANT OPTION
 RENAME TABLE procs_priv_backup TO mysql.procs_priv;

mysql-test/suite/percona/r/bug82026.result

@@ -5,5 +5,4 @@
 SELECT @ssl_cipher;
 @ssl_cipher
 NULL
-# restart:<hidden args>
-Pattern "Failed to set up SSL because of the following SSL library error: Failed to set ciphers to use" found
+Pattern "that is blocked. Please refer to the documentation for allowed ciphers" found

mysql-test/suite/percona/r/innodb_version.result

@@ -1,3 +1,3 @@
 SELECT @@innodb_version;
 @@innodb_version
-8.3.x-x
+8.4.x-x

mysql-test/suite/percona/r/mysqldump_innodb_optimize_keys.result

@@ -765,7 +765,7 @@ DROP TABLE t1;
 CREATE TABLE `t1` (
 `id` int DEFAULT NULL,
 `a` int DEFAULT NULL,
-KEY (`id`),
+UNIQUE KEY (`id`),
 FOREIGN KEY (`a`) REFERENCES `t1` (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 INSERT INTO t1 VALUES (1,1), (2,2), (3,3);
@@ -805,7 +805,7 @@ LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
 INSERT INTO `t1` VALUES (1,1),(2,2),(3,3),(4,NULL),(NULL,4);
 ALTER TABLE `t1`
-  ADD KEY `id` (`id`),
+  ADD UNIQUE KEY `id` (`id`),
   ADD KEY `a` (`a`);
 ALTER TABLE `t1` ADD CONSTRAINT `t1_ibfk_1` FOREIGN KEY (`a`) REFERENCES `t1` (`id`);
 /*!40000 ALTER TABLE `t1` ENABLE KEYS */;

mysql-test/suite/percona/r/proxy_protocol_admin_port.result

@@ -1,4 +1,4 @@
-# restart: --skip-name-resolve --admin-address=::ffff:127.0.0.1 --admin_port=ADMIN_PORT --admin-ssl=OFF --proxy_protocol_networks=*
+# restart: --skip-name-resolve --admin-address=::ffff:127.0.0.1 --admin_port=ADMIN_PORT --admin-tls-version= --proxy_protocol_networks=*
 # An unproxied client connection should be accepted when connection to an extra_port if proxying enabled on the server
 SHOW GLOBAL STATUS LIKE 'Threads_connected';
 Variable_name	Value

mysql-test/suite/percona/r/ssl_bug75311.result

@@ -3,4 +3,4 @@
 #
 SHOW STATUS LIKE 'Ssl_cipher_list';
 Variable_name	Value
-Ssl_cipher_list	DHE-RSA-AES256-SHA
+Ssl_cipher_list	ECDHE-RSA-AES128-GCM-SHA256

mysql-test/suite/percona/t/aborted_clients.test

@@ -15,7 +15,6 @@ SELECT VARIABLE_VALUE FROM performance_schema.global_status WHERE VARIABLE_NAME=
 
 # Kill a connection, check that aborted_clients is incremented
 connect(con2,localhost,root,,); 
---disable_reconnect
 --error ER_QUERY_INTERRUPTED
 KILL CONNECTION_ID();
 disconnect con2;

mysql-test/suite/percona/t/backup_safe_binlog_info.test

@@ -15,8 +15,8 @@ INSERT INTO t1 VALUES (1);
 CREATE TABLE t2(a INT) ENGINE=MyISAM;
 INSERT INTO t2 VALUES(2);
 
---let $binlog_file= query_get_value(SHOW MASTER STATUS, File, 1)
---let $binlog_pos= query_get_value(SHOW MASTER STATUS, Position, 1)
+--let $binlog_file= query_get_value(SHOW BINARY LOG STATUS, File, 1)
+--let $binlog_pos= query_get_value(SHOW BINARY LOG STATUS, Position, 1)
 
 LOCK TABLES FOR BACKUP;