Merge 10.4 into 10.5

mysql-test/suite/innodb/r/instant_alter_debug.result

@@ -381,11 +381,6 @@ a	b
 1	1
 DROP TABLE t1;
 SET debug_dbug = @save_dbug;
-SELECT variable_value-@old_instant instants
-FROM information_schema.global_status
-WHERE variable_name = 'innodb_instant_alter_column';
-instants
-28
 #
 # MDEV-24512 Assertion failed in rec_is_metadata()
 #            in btr_discard_only_page_on_level()
@@ -441,3 +436,8 @@ DROP TABLE t1;
 SET DEBUG_SYNC=RESET;
 # End of 10.5 tests
 SET GLOBAL innodb_purge_rseg_truncate_frequency = @save_frequency;
+SELECT variable_value-@old_instant instants
+FROM information_schema.global_status
+WHERE variable_name = 'innodb_instant_alter_column';
+instants
+32

mysql-test/suite/innodb/t/instant_alter_debug.test

@@ -233,6 +233,7 @@ connection default;
 SET DEBUG_SYNC = 'now WAIT_FOR copied';
 let $wait_all_purged = 1;
 --source include/wait_all_purged.inc
+let $wait_all_purged = 0;
 INSERT INTO t1 SET a=1;
 INSERT INTO t1 SET a=2,b=3,c=4;
 SET DEBUG_SYNC = 'now SIGNAL logged';
@@ -260,6 +261,7 @@ connection default;
 SET DEBUG_SYNC = 'now WAIT_FOR copied';
 let $wait_all_purged = 1;
 --source include/wait_all_purged.inc
+let $wait_all_purged = 0;
 INSERT INTO t1 SET a=1;
 INSERT INTO t1 SET a=2,c=4;
 SET DEBUG_SYNC = 'now SIGNAL logged';
@@ -430,10 +432,6 @@ DROP TABLE t1;
 
 SET debug_dbug = @save_dbug;
 
-SELECT variable_value-@old_instant instants
-FROM information_schema.global_status
-WHERE variable_name = 'innodb_instant_alter_column';
-
 --echo #
 --echo # MDEV-24512 Assertion failed in rec_is_metadata()
 --echo #            in btr_discard_only_page_on_level()
@@ -501,3 +499,7 @@ SET DEBUG_SYNC=RESET;
 --echo # End of 10.5 tests
 
 SET GLOBAL innodb_purge_rseg_truncate_frequency = @save_frequency;
+
+SELECT variable_value-@old_instant instants
+FROM information_schema.global_status
+WHERE variable_name = 'innodb_instant_alter_column';