database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Merge 10.5 to 10.6

Browse Source
This commit is contained in:
Daniel Black
2022-03-25 11:31:49 +11:00
parent 0da5f45a50 157a838b19
commit ec62f46a61
31 changed files with 357 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mysql-test/include/have_innodb.inc
View File

@@ -2,3 +2,15 @@
# suite.pm will make sure that all tests including this file
# will be skipped unless innodb is enabled
#
--disable_query_log
if (`select count(*) from information_schema.system_variables where variable_name='have_sanitizer' and global_value like "MSAN%"`)
{
SET STATEMENT sql_log_bin=0 FOR
call mtr.add_suppression("InnoDB: Trying to delete tablespace.*pending operations");
}
if ($VALGRIND_TEST)
{
SET STATEMENT sql_log_bin=0 FOR
call mtr.add_suppression("InnoDB: Trying to delete tablespace.*pending operations");
}
--enable_query_log