diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-10-13 10:57:21 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-10-13 10:57:21 +0300 |
| commit | d66f6f0cb464d40077dd0a91d55ef3e2179b3e6b (patch) | |
| tree | c206424e1e1f4602682bfc977cf43dfd566fa136 /mysql-test/suite/gcol | |
| parent | 095655365e514f75428b4245c4d8b3dee5c90d3b (diff) | |
| parent | 5197d81cdb59c3d5881cec9fbc607218ff1bde4f (diff) | |
| download | mariadb-git-d66f6f0cb464d40077dd0a91d55ef3e2179b3e6b.tar.gz | |
Merge 10.9 into 10.10
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 7835f42b552..3f3b2db8f32 100644 --- a/mysql-test/suite/gcol/r/innodb_virtual_debug_purge.result +++ b/mysql-test/suite/gcol/r/innodb_virtual_debug_purge.result @@ -150,10 +150,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 2f1f8b29aba..d9b764a75a7 100644 --- a/mysql-test/suite/gcol/t/innodb_virtual_debug_purge.test +++ b/mysql-test/suite/gcol/t/innodb_virtual_debug_purge.test @@ -191,10 +191,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; |