diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-11-17 15:03:47 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-11-17 15:03:47 +0200 |
| commit | 0a168398a0a1f80ae9becab10c777cfe4631ea70 (patch) | |
| tree | e34848f8d5044a60ad46f6652b4813a49915f810 /mysql-test/suite/innodb | |
| parent | 6841d1afddf8c9b433f98980f0ff0c940048b431 (diff) | |
| parent | 5489ce0ae1cb5c5bd6d4e75ae587aadc6e4b4d48 (diff) | |
| download | mariadb-git-0a168398a0a1f80ae9becab10c777cfe4631ea70.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'mysql-test/suite/innodb')
| -rw-r--r-- | mysql-test/suite/innodb/r/instant_alter_debug.result | 5 | ||||
| -rw-r--r-- | mysql-test/suite/innodb/t/instant_alter_debug.test | 7 |
2 files changed, 6 insertions, 6 deletions
diff --git a/mysql-test/suite/innodb/r/instant_alter_debug.result b/mysql-test/suite/innodb/r/instant_alter_debug.result index c74ec0a4bc4..d6229415d34 100644 --- a/mysql-test/suite/innodb/r/instant_alter_debug.result +++ b/mysql-test/suite/innodb/r/instant_alter_debug.result @@ -207,10 +207,11 @@ DELETE FROM t1; connection ddl; SET DEBUG_SYNC='row_log_table_apply1_before SIGNAL copied WAIT_FOR logged'; ALTER TABLE t1 FORCE; +connection default; +SET DEBUG_SYNC = 'now WAIT_FOR copied'; connection stop_purge; COMMIT; connection default; -SET DEBUG_SYNC = 'now WAIT_FOR copied'; InnoDB 1 transactions not purged INSERT INTO t1 SET a=1; INSERT INTO t1 SET a=2,b=3,c=4; @@ -230,9 +231,9 @@ DELETE FROM t1; connection ddl; SET DEBUG_SYNC='row_log_table_apply1_before SIGNAL copied WAIT_FOR logged'; ALTER TABLE t1 ADD COLUMN b INT NOT NULL DEFAULT 2 AFTER a, FORCE; -disconnect stop_purge; connection default; SET DEBUG_SYNC = 'now WAIT_FOR copied'; +disconnect stop_purge; InnoDB 1 transactions not purged INSERT INTO t1 SET a=1; INSERT INTO t1 SET a=2,c=4; diff --git a/mysql-test/suite/innodb/t/instant_alter_debug.test b/mysql-test/suite/innodb/t/instant_alter_debug.test index 9b174a1974b..02464d4f100 100644 --- a/mysql-test/suite/innodb/t/instant_alter_debug.test +++ b/mysql-test/suite/innodb/t/instant_alter_debug.test @@ -237,11 +237,11 @@ connection ddl; SET DEBUG_SYNC='row_log_table_apply1_before SIGNAL copied WAIT_FOR logged'; send ALTER TABLE t1 FORCE; +connection default; +SET DEBUG_SYNC = 'now WAIT_FOR copied'; connection stop_purge; COMMIT; - 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; @@ -266,10 +266,9 @@ connection ddl; SET DEBUG_SYNC='row_log_table_apply1_before SIGNAL copied WAIT_FOR logged'; send ALTER TABLE t1 ADD COLUMN b INT NOT NULL DEFAULT 2 AFTER a, FORCE; -disconnect stop_purge; - connection default; SET DEBUG_SYNC = 'now WAIT_FOR copied'; +disconnect stop_purge; let $wait_all_purged = 1; --source include/wait_all_purged.inc let $wait_all_purged = 0; |