Merge 10.5 into 10.6

MariaDB · Oct 6, 2022 · b9ac0a6 · b9ac0a6
2 parents 6dc157f + 5e66b63
commit b9ac0a6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/mysql-test/suite/perfschema/t/short_option_1.test b/mysql-test/suite/perfschema/t/short_option_1.test
@@ -1,3 +1,6 @@
+# Work around MDEV-29508
+--source include/not_valgrind.inc
+
 # Tests for PERFORMANCE_SCHEMA
 # Check server start for short server start options
 

diff --git a/mysql-test/suite/sys_vars/t/innodb_buffer_pool_dump_abort_loads.test b/mysql-test/suite/sys_vars/t/innodb_buffer_pool_dump_abort_loads.test
@@ -3,6 +3,7 @@
 #
 --source include/have_innodb.inc
 --source include/have_debug.inc
+--source include/no_valgrind_without_big.inc
 
 --echo
 --echo # innodb_buffer_pool_load_incomplete defaults 0