summaryrefslogtreecommitdiff
path: root/mysql-test/suite
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2023-02-28 16:05:21 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2023-02-28 16:05:21 +0200
commit085d0ac23868603bc7400d4b0949c63ce3a85a31 (patch)
tree40336fd6ee3f3d63d4425e763ae6fa5bec36ef9c /mysql-test/suite
parent3e2ad0e918d5d38322994ec9e08fc5dda3a80707 (diff)
parentc14a39431b211017e6809bb79c4079b38ffc3dff (diff)
downloadmariadb-git-085d0ac23868603bc7400d4b0949c63ce3a85a31.tar.gz
Merge 10.5 into 10.6
Diffstat (limited to 'mysql-test/suite')
-rw-r--r--mysql-test/suite/sys_vars/t/innodb_log_checkpoint_now_basic.test2
1 files changed, 2 insertions, 0 deletions
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;