diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-07-27 18:26:21 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-07-27 18:26:21 +0300 |
| commit | 742e1c727fc2be50b758068c2ab92abb19f3ff56 (patch) | |
| tree | b4efffa4eade915001faf0ceaf50715306416907 /mysql-test/suite/binlog_encryption | |
| parent | 19283c67c6d196a49211da6f925ca59fceef3ea0 (diff) | |
| parent | 30914389fe9ca13cf29470dd033a5cf6997a3931 (diff) | |
| download | mariadb-git-742e1c727fc2be50b758068c2ab92abb19f3ff56.tar.gz | |
Merge 10.6 into 10.7
Diffstat (limited to 'mysql-test/suite/binlog_encryption')
| -rw-r--r-- | mysql-test/suite/binlog_encryption/binlog_write_error.result | 1 | ||||
| -rw-r--r-- | mysql-test/suite/binlog_encryption/rpl_mixed_binlog_max_cache_size.result | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/suite/binlog_encryption/binlog_write_error.result b/mysql-test/suite/binlog_encryption/binlog_write_error.result index 2ee68465243..46a233718d9 100644 --- a/mysql-test/suite/binlog_encryption/binlog_write_error.result +++ b/mysql-test/suite/binlog_encryption/binlog_write_error.result @@ -1,3 +1,4 @@ +call mtr.add_suppression("Write to binary log failed: Error writing file*"); # # Test injecting binlog write error when executing queries # diff --git a/mysql-test/suite/binlog_encryption/rpl_mixed_binlog_max_cache_size.result b/mysql-test/suite/binlog_encryption/rpl_mixed_binlog_max_cache_size.result index 388c8e67b68..944ad9331ad 100644 --- a/mysql-test/suite/binlog_encryption/rpl_mixed_binlog_max_cache_size.result +++ b/mysql-test/suite/binlog_encryption/rpl_mixed_binlog_max_cache_size.result @@ -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; |