diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-10-06 08:29:56 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-10-06 08:29:56 +0300 |
commit | de078e060e9b967e8c243a93e461619d190e8786 (patch) | |
tree | 489f693f7f04bc4db935d1c78ae952d65d8feedf /mysql-test/suite/gcol | |
parent | 2154a1fc3566e994601a05875fdb65bd6f6d7133 (diff) | |
parent | 3708bef60683dc7b6020ee76e90738528ccad18a (diff) | |
download | mariadb-git-de078e060e9b967e8c243a93e461619d190e8786.tar.gz |
Merge 10.4 into 10.5
Diffstat (limited to 'mysql-test/suite/gcol')
-rw-r--r-- | mysql-test/suite/gcol/r/innodb_virtual_debug_purge.result | 3 | ||||
-rw-r--r-- | mysql-test/suite/gcol/t/innodb_virtual_debug_purge.test | 3 |
2 files changed, 0 insertions, 6 deletions
diff --git a/mysql-test/suite/gcol/r/innodb_virtual_debug_purge.result b/mysql-test/suite/gcol/r/innodb_virtual_debug_purge.result index e364821479a..4a204532630 100644 --- a/mysql-test/suite/gcol/r/innodb_virtual_debug_purge.result +++ b/mysql-test/suite/gcol/r/innodb_virtual_debug_purge.result @@ -148,10 +148,7 @@ lock table t write; connection prevent_purge; commit; connection default; -InnoDB 0 transactions not purged disconnect lock_table; -start transaction with consistent snapshot; -commit; InnoDB 0 transactions not purged set global debug_dbug=@old_dbug; drop table t; diff --git a/mysql-test/suite/gcol/t/innodb_virtual_debug_purge.test b/mysql-test/suite/gcol/t/innodb_virtual_debug_purge.test index cdec8107095..ca60ed84a98 100644 --- a/mysql-test/suite/gcol/t/innodb_virtual_debug_purge.test +++ b/mysql-test/suite/gcol/t/innodb_virtual_debug_purge.test @@ -189,10 +189,7 @@ lock table t write; connection prevent_purge; commit; connection default; ---source ../../innodb/include/wait_all_purged.inc disconnect lock_table; -start transaction with consistent snapshot; -commit; --source ../../innodb/include/wait_all_purged.inc set global debug_dbug=@old_dbug; drop table t; |