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 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

3
mysql-test/suite/binlog_encryption/binlog_index.result
View File

@ -5,6 +5,7 @@ call mtr.add_suppression('Turning logging off for the whole duration of the MySQ
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;
SET @saved_dbug = @@SESSION.debug_dbug;
RESET MASTER;
flush logs;
flush logs;
@ -183,5 +184,5 @@ master-bin.000011
master-bin.000012
master-bin.000013
SET SESSION debug_dbug="";
SET @@SESSION.debug_dbug = @saved_dbug;
End of tests