diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-03-06 13:37:12 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-03-06 13:37:12 +0200 |
| commit | 669a0c6efb89cd5df4eb117c9c44694a9fbeb52c (patch) | |
| tree | 93af8832773ce9f91db2c961bb2d2f4d49d3b027 /mysql-test | |
| parent | 550b8d76b3be360b1c7984a2531e094cd4c37f8c (diff) | |
| parent | 25c048066a9557d1aa506220316c6fa57be5da91 (diff) | |
| download | mariadb-git-669a0c6efb89cd5df4eb117c9c44694a9fbeb52c.tar.gz | |
Merge 10.6 into 10.8
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/include/not_valgrind_build.inc | 4 | ||||
| -rw-r--r-- | mysql-test/suite/sys_vars/t/innodb_log_checkpoint_now_basic.test | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/mysql-test/include/not_valgrind_build.inc b/mysql-test/include/not_valgrind_build.inc index 2b60f11bfc7..b62a1bc953b 100644 --- a/mysql-test/include/not_valgrind_build.inc +++ b/mysql-test/include/not_valgrind_build.inc @@ -1,4 +1,4 @@ -if (`select version() like '%valgrind%'`) +if (`select version() like '%valgrind%' || version() like '%asan%'`) { - skip Does not run with binaries built with valgrind; + skip Does not run with binaries built with valgrind or asan; } diff --git a/mysql-test/suite/sys_vars/t/innodb_log_checkpoint_now_basic.test b/mysql-test/suite/sys_vars/t/innodb_log_checkpoint_now_basic.test index 331803fff86..f59ebf649c3 100644 --- a/mysql-test/suite/sys_vars/t/innodb_log_checkpoint_now_basic.test +++ b/mysql-test/suite/sys_vars/t/innodb_log_checkpoint_now_basic.test @@ -1,5 +1,7 @@ --source include/have_innodb.inc --source include/have_debug.inc +# Valgrind builds may block on this one +--source include/not_valgrind.inc SET @start_global_value = @@global.innodb_log_checkpoint_now; SELECT @start_global_value; |