Merge 10.5 into 10.6

b9ac0a62 · Marko Mäkelä · 6dc157f8 · 5e66b63d · b9ac0a62 · b9ac0a62
Commit b9ac0a62 authored Oct 06, 2022 by Marko Mäkelä
2 changed files
--- a/mysql-test/suite/perfschema/t/short_option_1.test
+++ b/mysql-test/suite/perfschema/t/short_option_1.test
+# Work around MDEV-29508
+--source include/not_valgrind.inc
+
 # Tests for PERFORMANCE_SCHEMA
 # Check server start for short server start options


--- 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