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

Merge branch '10.2' into 10.3

Browse Source
This commit is contained in:
Oleksandr Byelkin
2020-12-23 19:28:02 +01:00
parent fa1aef39eb 8d8370e31d
commit 25561435e0
115 changed files with 1936 additions and 1234 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mysql-test/suite/binlog/t/binlog_truncate_innodb.test
View File

@@ -41,4 +41,5 @@ source include/binlog_truncate.test;
let $before_truncate = SET TRANSACTION ISOLATION LEVEL SERIALIZABLE;
source include/binlog_truncate.test;
SET BINLOG_FORMAT=@old_binlog_format;
SET @@global.binlog_format = @old_binlog_format;
SET @@session.binlog_format = @old_binlog_format;