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

Merge 10.5 into 10.6

Browse Source
This commit is contained in:
Marko Mäkelä
2022-07-27 17:52:37 +03:00
parent 772e3f61eb 098c0f2634
commit 30914389fe
274 changed files with 17603 additions and 7413 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/suite/binlog_encryption/binlog_write_error.result
View File

@ -1,3 +1,4 @@
call mtr.add_suppression("Write to binary log failed: Error writing file*");
#
# Test injecting binlog write error when executing queries
#

2
mysql-test/suite/binlog_encryption/rpl_mixed_binlog_max_cache_size.result
View File

@ -1,6 +1,8 @@
include/master-slave.inc
[connection master]
call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");
call mtr.add_suppression("Write to binary log failed: Multi-row statements required more than .max_binlog_stmt_cache_size");
call mtr.add_suppression("Write to binary log failed: Multi-statement transaction required more than .max_binlog_cache_size");
SET GLOBAL max_binlog_cache_size = 4096;
SET GLOBAL binlog_cache_size = 4096;
SET GLOBAL max_binlog_stmt_cache_size = 4096;