From cac655017c90d8827cff3b648b35910c88ed923c Mon Sep 17 00:00:00 2001 From: Oleksandr Kachan Date: Tue, 25 Jun 2024 20:48:30 +0300 Subject: [PATCH] PS-9218: Merge MySQL 8.4.0 (MTR test fixes) https://perconadev.atlassian.net/browse/PS-9218 - Remove enable/disbale_reconnect usages. - Replication related terminilogy changes. - Remove percona.bug1380010 test. It is outdated after changes in https://github.com/mysql/mysql-server/commit/8fbd2c7347cffddfc8a0fd4a78c5fd43074bb452. There is a test to check same issue added in https://github.com/mysql/mysql-server/commit/81f812be486316dcfde4233890f2fd13a203a8df. - Updated mysqldump_innodb_optimize_keys to use UNIQUE KEY for innodb-optimize-keys check as a result of https://github.com/mysql/mysql-server/commit/3a3a0794a712f6adc772146be7c2fefaeed241bf - Updated percona.bug82026. Change https://github.com/mysql/mysql-server/commit/38e7e1c1513ac2d2398bc0048bf3114bae6d4c3c introduced changes in ciphers validation, which resulted in changes in test behavior. - Update dd_bootstrap test, expected error message changed as a rusult of https://github.com/mysql/mysql-server/commit/7d26838b1b5441d8df15abaf42df88d728a22d5d - Update percona_innodb.ahi_partitions test as default for innodb_adaptive_hash_index was changed. --- mysql-test/include/send_kill_to_mysqld.inc | 1 - .../percona/include/binlog_utils_udf.inc | 2 +- .../percona_kill_idle_trx_non_trx_se.inc | 8 +-- mysql-test/suite/percona/r/bug1380010.result | 40 ------------- mysql-test/suite/percona/r/bug74778.result | 2 +- mysql-test/suite/percona/r/bug82026.result | 3 +- .../suite/percona/r/innodb_version.result | 2 +- .../r/mysqldump_innodb_optimize_keys.result | 4 +- .../r/proxy_protocol_admin_port.result | 2 +- .../suite/percona/r/ssl_bug75311.result | 2 +- .../suite/percona/t/aborted_clients.test | 1 - .../percona/t/backup_safe_binlog_info.test | 4 +- mysql-test/suite/percona/t/bug1380010.test | 60 ------------------- mysql-test/suite/percona/t/bug82026.test | 16 ++--- mysql-test/suite/percona/t/bug_ps1095.test | 3 +- .../percona/t/change_user_notembedded.test | 1 - .../suite/percona/t/failed_auth_3909.test | 1 - .../suite/percona/t/group_commit_crash.test | 2 - .../suite/percona/t/innodb_version.test | 2 +- .../percona/t/mysqlbinlog_ssl_compress.test | 2 +- .../t/mysqldump_innodb_optimize_keys.test | 2 +- .../percona/t/proxy_protocol_admin_port.test | 3 +- .../suite/percona/t/ssl_bug75311-master.opt | 2 +- .../suite/percona/t/tc-heuristic-recover.test | 2 - .../include/percona_kill_idle_trx.inc | 6 +- .../percona_innodb/r/ahi_partitions.result | 3 + .../percona_innodb/t/ahi_partitions.test | 5 ++ .../suite/percona_innodb/t/bug64663.test | 2 - mysql-test/t/auth_rpl.test | 2 +- mysql-test/t/dd_bootstrap.test | 2 +- 30 files changed, 44 insertions(+), 143 deletions(-) delete mode 100644 mysql-test/suite/percona/r/bug1380010.result delete mode 100644 mysql-test/suite/percona/t/bug1380010.test diff --git a/mysql-test/include/send_kill_to_mysqld.inc b/mysql-test/include/send_kill_to_mysqld.inc index 857426daece9..5d17f199ef32 100644 --- a/mysql-test/include/send_kill_to_mysqld.inc +++ b/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 diff --git a/mysql-test/suite/percona/include/binlog_utils_udf.inc b/mysql-test/suite/percona/include/binlog_utils_udf.inc index 5b3f4449a6ef..cd2c3ed44f79 100644 --- a/mysql-test/suite/percona/include/binlog_utils_udf.inc +++ b/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) diff --git a/mysql-test/suite/percona/include/percona_kill_idle_trx_non_trx_se.inc b/mysql-test/suite/percona/include/percona_kill_idle_trx_non_trx_se.inc index 740d598e08d9..bd78ba4a1349 100644 --- a/mysql-test/suite/percona/include/percona_kill_idle_trx_non_trx_se.inc +++ b/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; diff --git a/mysql-test/suite/percona/r/bug1380010.result b/mysql-test/suite/percona/r/bug1380010.result deleted file mode 100644 index 4eb22bd82f66..000000000000 --- a/mysql-test/suite/percona/r/bug1380010.result +++ /dev/null @@ -1,40 +0,0 @@ -CREATE TABLE ttt(c1 CHAR(250), c2 TIME NOT NULL) ENGINE=InnoDB CHARACTER SET=latin1; -BINLOG ' -VydmVA8BAAAAZwAAAGsAAAAAAAQANS41LjM2LTM0LjAtZGVidWctbG9nAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAABXJ2ZUEzgNAAgAEgAEBAQEEgAAVAAEGggAAAAICAgCAA== -'; -BEGIN; -BINLOG ' -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 -'; -COMMIT; -SELECT COUNT(*) FROM ttt; -COUNT(*) -64 -DROP TABLE ttt; diff --git a/mysql-test/suite/percona/r/bug74778.result b/mysql-test/suite/percona/r/bug74778.result index acb770f9e57c..1d11459efa31 100644 --- a/mysql-test/suite/percona/r/bug74778.result +++ b/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; diff --git a/mysql-test/suite/percona/r/bug82026.result b/mysql-test/suite/percona/r/bug82026.result index 599a182b66d1..e7be6e755613 100644 --- a/mysql-test/suite/percona/r/bug82026.result +++ b/mysql-test/suite/percona/r/bug82026.result @@ -5,5 +5,4 @@ SELECT @ssl_cipher; @ssl_cipher NULL -# restart: -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 diff --git a/mysql-test/suite/percona/r/innodb_version.result b/mysql-test/suite/percona/r/innodb_version.result index 597ad7e6a8c1..857dae47438a 100644 --- a/mysql-test/suite/percona/r/innodb_version.result +++ b/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 diff --git a/mysql-test/suite/percona/r/mysqldump_innodb_optimize_keys.result b/mysql-test/suite/percona/r/mysqldump_innodb_optimize_keys.result index ec94ebea4c2f..09bd81563c2f 100644 --- a/mysql-test/suite/percona/r/mysqldump_innodb_optimize_keys.result +++ b/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 */; diff --git a/mysql-test/suite/percona/r/proxy_protocol_admin_port.result b/mysql-test/suite/percona/r/proxy_protocol_admin_port.result index de54284234ab..ba3b367739fa 100644 --- a/mysql-test/suite/percona/r/proxy_protocol_admin_port.result +++ b/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 diff --git a/mysql-test/suite/percona/r/ssl_bug75311.result b/mysql-test/suite/percona/r/ssl_bug75311.result index 3506db12d9de..a96a66409ae8 100644 --- a/mysql-test/suite/percona/r/ssl_bug75311.result +++ b/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 diff --git a/mysql-test/suite/percona/t/aborted_clients.test b/mysql-test/suite/percona/t/aborted_clients.test index 4e71b1431328..a6132e641e57 100644 --- a/mysql-test/suite/percona/t/aborted_clients.test +++ b/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; diff --git a/mysql-test/suite/percona/t/backup_safe_binlog_info.test b/mysql-test/suite/percona/t/backup_safe_binlog_info.test index 6e5478965efb..e579fd1ab2cb 100644 --- a/mysql-test/suite/percona/t/backup_safe_binlog_info.test +++ b/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; diff --git a/mysql-test/suite/percona/t/bug1380010.test b/mysql-test/suite/percona/t/bug1380010.test deleted file mode 100644 index bb68debcfab8..000000000000 --- a/mysql-test/suite/percona/t/bug1380010.test +++ /dev/null @@ -1,60 +0,0 @@ -# -# Test for https://bugs.launchpad.net/percona-server/+bug/1380010: in RBR, -# if there is a virtual temporary table for row conversion present, a Table_map -# event followed by two row events will crash the server. -# -# The current server does not produce such binlog. The statements below were -# produced by running, on 5.5.36-34.0: -# insert into ttt(c1) values (1000*rand()), (1000*rand()), (1000*rand()), (1000*rand()); -# insert into ttt(c1) select 1000*rand() from ttt t1, ttt t2, ttt t3; -# -CREATE TABLE ttt(c1 CHAR(250), c2 TIME NOT NULL) ENGINE=InnoDB CHARACTER SET=latin1; - -BINLOG ' -VydmVA8BAAAAZwAAAGsAAAAAAAQANS41LjM2LTM0LjAtZGVidWctbG9nAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAABXJ2ZUEzgNAAgAEgAEBAQEEgAAVAAEGggAAAAICAgCAA== -'; - -BEGIN; - -# at 600 -#141114 18:01:27 server id 1 end_log_pos 645 Table_map: `test`.`ttt` mapped to number 41 -# at 645 -#141114 18:01:27 server id 1 end_log_pos 1670 Write_rows: table id 41 -# at 1670 -#141114 18:01:27 server id 1 end_log_pos 2122 Write_rows: table id 41 flags: STMT_END_F - -BINLOG ' -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 -'; -COMMIT; - -SELECT COUNT(*) FROM ttt; - -DROP TABLE ttt; diff --git a/mysql-test/suite/percona/t/bug82026.test b/mysql-test/suite/percona/t/bug82026.test index 91cb6a62597e..fe23dcaed996 100644 --- a/mysql-test/suite/percona/t/bug82026.test +++ b/mysql-test/suite/percona/t/bug82026.test @@ -7,17 +7,19 @@ # As the negotiation starts from the highest version of protocol, restart will succeed without disabling them # on platforms with TLSv1.3 (OpenSSL 1.1.1) +--source include/shutdown_mysqld.inc + --let SEARCH_FILE= $MYSQLTEST_VARDIR/tmp/my_restart.err ---let $do_not_echo_parameters= 1 ---let restart_parameters= restart:--log-error=$SEARCH_FILE --tls-ciphersuites= --ssl-cipher=XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX +--error 1 +--exec $MYSQLD --log-error=$SEARCH_FILE --tls-ciphersuites= --ssl-cipher=XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX ---source include/restart_mysqld.inc +--let $restart_parameters= +--let $do_not_echo_parameters= 1 +--source include/start_mysqld.inc +--source include/wait_until_connected_again.inc SELECT @ssl_cipher; ---let restart_parameters= ---source include/restart_mysqld.inc - ---let SEARCH_PATTERN=Failed to set up SSL because of the following SSL library error: Failed to set ciphers to use +--let SEARCH_PATTERN=that is blocked. Please refer to the documentation for allowed ciphers --source include/search_pattern.inc --remove_file $SEARCH_FILE diff --git a/mysql-test/suite/percona/t/bug_ps1095.test b/mysql-test/suite/percona/t/bug_ps1095.test index 7c85e0565b0b..6f0363bf94a8 100644 --- a/mysql-test/suite/percona/t/bug_ps1095.test +++ b/mysql-test/suite/percona/t/bug_ps1095.test @@ -7,8 +7,7 @@ CREATE TABLE t1 (i int); --sleep 9 --source include/wait_until_disconnected.inc - ---enable_reconnect +--connect --connection default DROP TABLE t1; diff --git a/mysql-test/suite/percona/t/change_user_notembedded.test b/mysql-test/suite/percona/t/change_user_notembedded.test index a1a28a1d25bd..54e8b2b34451 100644 --- a/mysql-test/suite/percona/t/change_user_notembedded.test +++ b/mysql-test/suite/percona/t/change_user_notembedded.test @@ -5,7 +5,6 @@ SELECT "A testcase needs at leat one query executed"; --source include/count_sessions.inc connect (test,localhost,root,,); connection test; ---enable_reconnect --error ER_ACCESS_DENIED_ERROR,CR_SERVER_GONE_ERROR,CR_SERVER_LOST change_user foo,bar; --error ER_ACCESS_DENIED_ERROR,CR_SERVER_GONE_ERROR,CR_SERVER_LOST diff --git a/mysql-test/suite/percona/t/failed_auth_3909.test b/mysql-test/suite/percona/t/failed_auth_3909.test index 33cb4fbcaa36..3498f61d70f6 100644 --- a/mysql-test/suite/percona/t/failed_auth_3909.test +++ b/mysql-test/suite/percona/t/failed_auth_3909.test @@ -25,7 +25,6 @@ change_user u1; --error ER_ACCESS_DENIED_ERROR change_user u2; ---enable_reconnect --error ER_ACCESS_DENIED_ERROR change_user u2,password; diff --git a/mysql-test/suite/percona/t/group_commit_crash.test b/mysql-test/suite/percona/t/group_commit_crash.test index 6a75e4835923..984006d9f6b0 100644 --- a/mysql-test/suite/percona/t/group_commit_crash.test +++ b/mysql-test/suite/percona/t/group_commit_crash.test @@ -42,8 +42,6 @@ while ($numinserts) INSERT INTO t2(a, b, c, d) VALUES ('a', 'b', 'c', 'd'); } ---enable_reconnect - while ($numtests) { RESET BINARY LOGS AND GTIDS; diff --git a/mysql-test/suite/percona/t/innodb_version.test b/mysql-test/suite/percona/t/innodb_version.test index 6aa263115823..a6a9c0dfa673 100644 --- a/mysql-test/suite/percona/t/innodb_version.test +++ b/mysql-test/suite/percona/t/innodb_version.test @@ -2,5 +2,5 @@ # Bug #917246: Unintentional change of innodb_version format in 5.1.60 ######################################################################## ---replace_regex /8\.3\.[0-9]+-[0-9]+/8.3.x-x/ +--replace_regex /8\.4\.[0-9]+-[0-9]+/8.4.x-x/ SELECT @@innodb_version; diff --git a/mysql-test/suite/percona/t/mysqlbinlog_ssl_compress.test b/mysql-test/suite/percona/t/mysqlbinlog_ssl_compress.test index abcc1f49dd39..24072e13f377 100644 --- a/mysql-test/suite/percona/t/mysqlbinlog_ssl_compress.test +++ b/mysql-test/suite/percona/t/mysqlbinlog_ssl_compress.test @@ -14,7 +14,7 @@ RESET BINARY LOGS AND GTIDS; create table t1 (word varchar(20)); ---let $binlog_start_pos=query_get_value(SHOW MASTER STATUS, Position, 1) +--let $binlog_start_pos=query_get_value(SHOW BINARY LOG STATUS, Position, 1) # simple test for simple statement and various events insert into t1 values ("abirvalg"); flush logs; diff --git a/mysql-test/suite/percona/t/mysqldump_innodb_optimize_keys.test b/mysql-test/suite/percona/t/mysqldump_innodb_optimize_keys.test index 1d8a3428a344..b45aa45edf25 100644 --- a/mysql-test/suite/percona/t/mysqldump_innodb_optimize_keys.test +++ b/mysql-test/suite/percona/t/mysqldump_innodb_optimize_keys.test @@ -335,7 +335,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; diff --git a/mysql-test/suite/percona/t/proxy_protocol_admin_port.test b/mysql-test/suite/percona/t/proxy_protocol_admin_port.test index db5db44079c4..e337b2ee9062 100644 --- a/mysql-test/suite/percona/t/proxy_protocol_admin_port.test +++ b/mysql-test/suite/percona/t/proxy_protocol_admin_port.test @@ -2,10 +2,11 @@ --source include/have_ipv4_mapped.inc --source include/add_extra_root_users.inc --source include/count_sessions.inc +--source include/suppress_tls_off.inc --let $PORT_OFFSET = 100 --expr $ADMIN_PORT = $MASTER_MYPORT + $PORT_OFFSET ---let $restart_parameters=restart: --skip-name-resolve --admin-address=::ffff:127.0.0.1 --admin_port=$ADMIN_PORT --admin-ssl=OFF --proxy_protocol_networks=* +--let $restart_parameters=restart: --skip-name-resolve --admin-address=::ffff:127.0.0.1 --admin_port=$ADMIN_PORT --admin-tls-version= --proxy_protocol_networks=* --replace_result $ADMIN_PORT ADMIN_PORT --source include/restart_mysqld.inc diff --git a/mysql-test/suite/percona/t/ssl_bug75311-master.opt b/mysql-test/suite/percona/t/ssl_bug75311-master.opt index 6f21a348785c..0f94d58a3e56 100644 --- a/mysql-test/suite/percona/t/ssl_bug75311-master.opt +++ b/mysql-test/suite/percona/t/ssl_bug75311-master.opt @@ -3,4 +3,4 @@ # --ssl-cipher= - we need only this TLSv1.2 cipher # --tls-version= - server accepts only TLSv1.2 ---ssl-cipher=DHE-RSA-AES256-SHA --tls-ciphersuites= --tls-version=TLSv1.2 +--ssl-cipher=ECDHE-RSA-AES128-GCM-SHA256 --tls-ciphersuites= --tls-version=TLSv1.2 diff --git a/mysql-test/suite/percona/t/tc-heuristic-recover.test b/mysql-test/suite/percona/t/tc-heuristic-recover.test index 05d2ef357b7b..1fe2a0d98cb3 100644 --- a/mysql-test/suite/percona/t/tc-heuristic-recover.test +++ b/mysql-test/suite/percona/t/tc-heuristic-recover.test @@ -21,7 +21,6 @@ COMMIT; --error 1 --exec $MYSQLD_CMD --tc-heuristic-recover=ROLLBACK --console > $restart_log 2>&1 --exec echo "restart" > $restart_file ---enable_reconnect --source include/wait_until_connected_again.inc --echo 2 should be absent: @@ -39,7 +38,6 @@ COMMIT; --error 1 --exec $MYSQLD_CMD --tc-heuristic-recover=COMMIT --console >> $restart_log 2>&1 --exec echo "restart" > $restart_file ---enable_reconnect --source include/wait_until_connected_again.inc --echo 2 should be absent due to COMMIT to ROLLBACK conversion: diff --git a/mysql-test/suite/percona_innodb/include/percona_kill_idle_trx.inc b/mysql-test/suite/percona_innodb/include/percona_kill_idle_trx.inc index 76179ec28678..2e3374ea486f 100644 --- a/mysql-test/suite/percona_innodb/include/percona_kill_idle_trx.inc +++ b/mysql-test/suite/percona_innodb/include/percona_kill_idle_trx.inc @@ -21,15 +21,17 @@ 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 SELECT * FROM t1; --echo # --echo # Test that row locks are released on idle transaction kill --echo # +--disable_query_log +call mtr.add_suppression("IO-layer timeout before wait_timeout was reached"); +--enable_query_log + SET GLOBAL kill_idle_transaction= 2; --connect (conn1,localhost,root,,) diff --git a/mysql-test/suite/percona_innodb/r/ahi_partitions.result b/mysql-test/suite/percona_innodb/r/ahi_partitions.result index 3acf66785265..1657f8c1bff4 100644 --- a/mysql-test/suite/percona_innodb/r/ahi_partitions.result +++ b/mysql-test/suite/percona_innodb/r/ahi_partitions.result @@ -1,3 +1,5 @@ +SET @saved_innodb_adaptive_hash_index = @@GLOBAL.innodb_adaptive_hash_index; +SET GLOBAL innodb_adaptive_hash_index=ON; SELECT @@GLOBAL.innodb_adaptive_hash_index; @@GLOBAL.innodb_adaptive_hash_index 1 @@ -29,3 +31,4 @@ should_be_1 1 SET GLOBAL innodb_monitor_disable=module_adaptive_hash; DROP TABLE t1, t2, t3; +SET GLOBAL innodb_adaptive_hash_index = @saved_innodb_adaptive_hash_index; diff --git a/mysql-test/suite/percona_innodb/t/ahi_partitions.test b/mysql-test/suite/percona_innodb/t/ahi_partitions.test index 435449663a52..e018cd0afd35 100644 --- a/mysql-test/suite/percona_innodb/t/ahi_partitions.test +++ b/mysql-test/suite/percona_innodb/t/ahi_partitions.test @@ -4,6 +4,9 @@ # # Check setup +SET @saved_innodb_adaptive_hash_index = @@GLOBAL.innodb_adaptive_hash_index; +SET GLOBAL innodb_adaptive_hash_index=ON; + SELECT @@GLOBAL.innodb_adaptive_hash_index; SELECT @@GLOBAL.innodb_adaptive_hash_index_parts; @@ -61,3 +64,5 @@ SET GLOBAL innodb_monitor_disable=module_adaptive_hash; DROP TABLE t1, t2, t3; --source include/innodb_monitor_restore.inc + +SET GLOBAL innodb_adaptive_hash_index = @saved_innodb_adaptive_hash_index; diff --git a/mysql-test/suite/percona_innodb/t/bug64663.test b/mysql-test/suite/percona_innodb/t/bug64663.test index 1bac31672b18..153857bb756d 100644 --- a/mysql-test/suite/percona_innodb/t/bug64663.test +++ b/mysql-test/suite/percona_innodb/t/bug64663.test @@ -18,8 +18,6 @@ SET debug="+d,crash_innodb_add_index_after"; --error CR_SERVER_LOST ALTER TABLE t1 ADD INDEX (b); ---enable_reconnect - --source include/wait_until_connected_again.inc # Ignore ndb_binlog_index to have same results not depending on whether NDB is enabled or not diff --git a/mysql-test/t/auth_rpl.test b/mysql-test/t/auth_rpl.test index b058ca46849b..7dadc68b0672 100644 --- a/mysql-test/t/auth_rpl.test +++ b/mysql-test/t/auth_rpl.test @@ -57,7 +57,7 @@ SELECT user, plugin, authentication_string FROM mysql.user WHERE user LIKE 'plug --echo # Cleanup (on slave). --source include/rpl/stop_replica.inc --replace_column 2 #### -eval CHANGE REPLICATION SOURCE TO SOURCE_USER='$master_user', SOURCE_PASSWORD=''; +eval CHANGE REPLICATION SOURCE TO SOURCE_USER='$source_user', SOURCE_PASSWORD=''; DROP USER 'plug_user'; --echo # Cleanup (on master). diff --git a/mysql-test/t/dd_bootstrap.test b/mysql-test/t/dd_bootstrap.test index e0c882657759..fdffb55ada55 100644 --- a/mysql-test/t/dd_bootstrap.test +++ b/mysql-test/t/dd_bootstrap.test @@ -74,7 +74,7 @@ perl; use strict; my $log= $ENV{'MYSQLD_LOG'} or die; open(FILE, "$log") or die; - my $c_e= grep(/Can\'t open file: \'mysql.ibd\'/gi,); + my $c_e= grep(/Failed to determine if mysql\.ibd is encrypted\. Have you deleted it/gi,); print "# DD initialization error found $c_e times.\n"; close(FILE); EOF