diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-01-25 15:06:52 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-01-25 15:06:52 +0200 |
| commit | 927a882341eb1087e71d64de4e8cd89ab520de89 (patch) | |
| tree | 1693095d5c98a98fdebadbd755bce6d7ada7e334 | |
| parent | 961c7938bb4df7a19ccd8def1e57669f7600d3e5 (diff) | |
| parent | e626f511f9dc4faee9ae98fb5a8c8c6ddd06679b (diff) | |
| download | mariadb-git-927a882341eb1087e71d64de4e8cd89ab520de89.tar.gz | |
Merge 10.4 into 10.5
| -rw-r--r-- | mysql-test/suite/innodb/r/instant_alter_debug.result | 10 | ||||
| -rw-r--r-- | mysql-test/suite/innodb/t/instant_alter_debug.test | 10 |
2 files changed, 11 insertions, 9 deletions
diff --git a/mysql-test/suite/innodb/r/instant_alter_debug.result b/mysql-test/suite/innodb/r/instant_alter_debug.result index 34d9698b201..20e965aecff 100644 --- a/mysql-test/suite/innodb/r/instant_alter_debug.result +++ b/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 diff --git a/mysql-test/suite/innodb/t/instant_alter_debug.test b/mysql-test/suite/innodb/t/instant_alter_debug.test index 3594c3da6d5..c0a16f47df6 100644 --- a/mysql-test/suite/innodb/t/instant_alter_debug.test +++ b/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'; |