Merge 10.10 into 10.11

2025-08-07 00:04:31 +03:00 · 2023-03-29 16:53:37 +03:00
parent 50c8ef01fc 191821f7df
commit d84a282629
114 changed files with 3105 additions and 3032 deletions
--- a/mysql-test/suite/binlog_encryption/rpl_parallel_analyze_table_hang.test
+++ b/mysql-test/suite/binlog_encryption/rpl_parallel_analyze_table_hang.test
@@ -1 +1 @@
--source suite/rpl/include/rpl_parallel_analyze_table_hang.inc
+--source suite/rpl/t/rpl_parallel_analyze_table_hang.test
--- a/mysql-test/suite/binlog_encryption/rpl_parallel_deadlock_corrupt_binlog.test
+++ b/mysql-test/suite/binlog_encryption/rpl_parallel_deadlock_corrupt_binlog.test
@@ -1 +1 @@
--source suite/rpl/include/rpl_parallel_deadlock_corrupt_binlog.inc
+--source suite/rpl/t/rpl_parallel_deadlock_corrupt_binlog.test
--- a/mysql-test/suite/binlog_encryption/rpl_parallel_domain.test
+++ b/mysql-test/suite/binlog_encryption/rpl_parallel_domain.test
@@ -1 +1 @@
--source suite/rpl/include/rpl_parallel_domain.inc
+--source suite/rpl/t/rpl_parallel_domain.test
--- a/mysql-test/suite/binlog_encryption/rpl_parallel_domain_slave_single_grp.test
+++ b/mysql-test/suite/binlog_encryption/rpl_parallel_domain_slave_single_grp.test
@@ -1 +1 @@
--source suite/rpl/include/rpl_parallel_domain_slave_single_grp.inc
+--source suite/rpl/t/rpl_parallel_domain_slave_single_grp.test
--- a/mysql-test/suite/binlog_encryption/rpl_parallel_free_deferred_event.test
+++ b/mysql-test/suite/binlog_encryption/rpl_parallel_free_deferred_event.test
@@ -1 +1 @@
--source suite/rpl/include/rpl_parallel_free_deferred_event.inc
+--source suite/rpl/t/rpl_parallel_free_deferred_event.test
--- a/mysql-test/suite/binlog_encryption/rpl_parallel_gco_wait_kill.test
+++ b/mysql-test/suite/binlog_encryption/rpl_parallel_gco_wait_kill.test
@@ -1 +1 @@
--source suite/rpl/include/rpl_parallel_gco_wait_kill.inc
+--source suite/rpl/t/rpl_parallel_gco_wait_kill.test
--- a/mysql-test/suite/binlog_encryption/rpl_parallel_gtid_slave_pos_update_fail.test
+++ b/mysql-test/suite/binlog_encryption/rpl_parallel_gtid_slave_pos_update_fail.test
@@ -1 +1 @@
--source suite/rpl/include/rpl_parallel_gtid_slave_pos_update_fail.inc
+--source suite/rpl/t/rpl_parallel_gtid_slave_pos_update_fail.test
--- a/mysql-test/suite/binlog_encryption/rpl_parallel_ignore_error_on_rotate.test
+++ b/mysql-test/suite/binlog_encryption/rpl_parallel_ignore_error_on_rotate.test
@@ -1 +1 @@
--source suite/rpl/include/rpl_parallel_ignore_error_on_rotate.inc
+--source suite/rpl/t/rpl_parallel_ignore_error_on_rotate.test
--- a/mysql-test/suite/binlog_encryption/rpl_parallel_innodb_lock_conflict.test
+++ b/mysql-test/suite/binlog_encryption/rpl_parallel_innodb_lock_conflict.test
@@ -1 +1 @@
--source suite/rpl/include/rpl_parallel_innodb_lock_conflict.inc
+--source suite/rpl/t/rpl_parallel_innodb_lock_conflict.test
--- a/mysql-test/suite/binlog_encryption/rpl_parallel_missed_error_handling.test
+++ b/mysql-test/suite/binlog_encryption/rpl_parallel_missed_error_handling.test
@@ -1 +1 @@
--source suite/rpl/include/rpl_parallel_missed_error_handling.inc
+--source suite/rpl/t/rpl_parallel_missed_error_handling.test
--- a/mysql-test/suite/binlog_encryption/rpl_parallel_mode.test
+++ b/mysql-test/suite/binlog_encryption/rpl_parallel_mode.test
@@ -1 +1 @@
--source suite/rpl/include/rpl_parallel_mode.inc
+--source suite/rpl/t/rpl_parallel_mode.test
--- a/mysql-test/suite/binlog_encryption/rpl_parallel_partial_binlog_trans.test
+++ b/mysql-test/suite/binlog_encryption/rpl_parallel_partial_binlog_trans.test
@@ -1 +1 @@
--source suite/rpl/include/rpl_parallel_partial_binlog_trans.inc
+--source suite/rpl/t/rpl_parallel_partial_binlog_trans.test
--- a/mysql-test/suite/binlog_encryption/rpl_parallel_record_gtid_wakeup.test
+++ b/mysql-test/suite/binlog_encryption/rpl_parallel_record_gtid_wakeup.test
@@ -1 +1 @@
--source suite/rpl/include/rpl_parallel_record_gtid_wakeup.inc
+--source suite/rpl/t/rpl_parallel_record_gtid_wakeup.test
--- a/mysql-test/suite/binlog_encryption/rpl_parallel_retry_deadlock.test
+++ b/mysql-test/suite/binlog_encryption/rpl_parallel_retry_deadlock.test
@@ -1 +1 @@
--source suite/rpl/include/rpl_parallel_retry_deadlock.inc
+--source suite/rpl/t/rpl_parallel_retry_deadlock.test
--- a/mysql-test/suite/binlog_encryption/rpl_parallel_rollback_assert.test
+++ b/mysql-test/suite/binlog_encryption/rpl_parallel_rollback_assert.test
@@ -1 +1 @@
--source suite/rpl/include/rpl_parallel_rollback_assert.inc
+--source suite/rpl/t/rpl_parallel_rollback_assert.test
--- a/mysql-test/suite/binlog_encryption/rpl_parallel_single_grpcmt.test
+++ b/mysql-test/suite/binlog_encryption/rpl_parallel_single_grpcmt.test
@@ -1 +1 @@
--source suite/rpl/include/rpl_parallel_single_grpcmt.inc
+--source suite/rpl/t/rpl_parallel_single_grpcmt.test
--- a/mysql-test/suite/binlog_encryption/rpl_parallel_slave_bgc_kill.test
+++ b/mysql-test/suite/binlog_encryption/rpl_parallel_slave_bgc_kill.test
@@ -1 +1 @@
--source suite/rpl/include/rpl_parallel_slave_bgc_kill.inc
+--source suite/rpl/t/rpl_parallel_slave_bgc_kill.test
--- a/mysql-test/suite/binlog_encryption/rpl_parallel_stop_on_con_kill.test
+++ b/mysql-test/suite/binlog_encryption/rpl_parallel_stop_on_con_kill.test
@@ -1 +1 @@
--source suite/rpl/include/rpl_parallel_stop_on_con_kill.inc
+--source suite/rpl/t/rpl_parallel_stop_on_con_kill.test
--- a/mysql-test/suite/binlog_encryption/rpl_parallel_stop_slave.test
+++ b/mysql-test/suite/binlog_encryption/rpl_parallel_stop_slave.test
@@ -1 +1 @@
--source suite/rpl/include/rpl_parallel_stop_slave.inc
+--source suite/rpl/t/rpl_parallel_stop_slave.test
--- a/mysql-test/suite/binlog_encryption/rpl_parallel_wrong_binlog_order.test
+++ b/mysql-test/suite/binlog_encryption/rpl_parallel_wrong_binlog_order.test
@@ -1 +1 @@
--source suite/rpl/include/rpl_parallel_wrong_binlog_order.inc
+--source suite/rpl/t/rpl_parallel_wrong_binlog_order.test
--- a/mysql-test/suite/binlog_encryption/rpl_parallel_wrong_exec_master_pos.test
+++ b/mysql-test/suite/binlog_encryption/rpl_parallel_wrong_exec_master_pos.test
@@ -1 +1 @@
--source suite/rpl/include/rpl_parallel_wrong_exec_master_pos.inc
+--source suite/rpl/t/rpl_parallel_wrong_exec_master_pos.test