database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-25 17:25:02 +03:00
Code Activity

Merge 10.4 into 10.5

Browse Source
This commit is contained in:
Marko Mäkelä
2022-07-27 17:17:24 +03:00
parent 5bf4dee369 e5c4f4e590
commit 098c0f2634
278 changed files with 17690 additions and 7421 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/suite/binlog/r/binlog_bug23533.result
View File

@@ -1,3 +1,4 @@
call mtr.add_suppression("Write to binary log failed: Multi-statement transaction required more than .max_binlog_cache_size.*");
SET AUTOCOMMIT=0;
CREATE TABLE t1 (a INT NOT NULL AUTO_INCREMENT, b TEXT, PRIMARY KEY(a)) ENGINE=InnoDB;
SELECT COUNT(*) FROM t1;

1
mysql-test/suite/binlog/r/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/t/binlog_bug23533.test
View File

@@ -6,7 +6,7 @@
--source include/have_innodb.inc
--source include/have_log_bin.inc
--source include/have_binlog_format_row.inc
call mtr.add_suppression("Write to binary log failed: Multi-statement transaction required more than .max_binlog_cache_size.*");
SET AUTOCOMMIT=0;
# Create 1st table

2
mysql-test/suite/binlog/t/binlog_write_error.test
View File

@@ -21,6 +21,8 @@
source include/have_debug.inc;
source include/have_binlog_format_mixed_or_statement.inc;
call mtr.add_suppression("Write to binary log failed: Error writing file*");
--echo #
--echo # Test injecting binlog write error when executing queries
--echo #