database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge branch '10.5' into 10.6

Browse Source
This commit is contained in:
Sergei Golubchik
2024-04-29 10:08:58 +02:00
parent 52f6df99ed 267dd5a993
commit c1f3eff53f
34 changed files with 348 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,6 +3,11 @@
# will be skipped unless innodb is enabled
#
--disable_query_log
if (`select version() like '%debug%'`)
{
SET STATEMENT sql_log_bin=0 FOR
call mtr.add_suppression("InnoDB: Trying to delete tablespace.*pending operations");
}
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