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-01-24 14:16:20 +01:00
parent ade89fc898 f2ccfcaca1
commit ceda5f724f
63 changed files with 372 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/suite/binlog/include/binlog_index.inc
View File

@@ -22,7 +22,7 @@ call mtr.add_suppression('Could not use .*');
call mtr.add_suppression('MYSQL_BIN_LOG::purge_logs failed to clean registers before purging logs.');
flush tables;
let $old=`select @@debug`;
SET @saved_dbug = @@SESSION.debug_dbug;
RESET MASTER;
@@ -273,6 +273,6 @@ SELECT @index;
-- replace_regex /\.[\\\/]master/master/
SELECT @index;
eval SET SESSION debug_dbug="$old";
SET @@SESSION.debug_dbug = @saved_dbug;
--echo End of tests