database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

perfschema compilation, test and misc fixes

Browse Source
This commit is contained in:
Sergei Golubchik
2020-02-15 18:25:57 +01:00
parent 81cffda2e6
commit 7af733a5a2
403 changed files with 20147 additions and 63173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mysql-test/suite/perfschema/r/rpl_statements.result
View File

@ -8,11 +8,7 @@ connection master;
*** Create test tables
<<<<<<< HEAD
show variables like 'binlog_format%';
=======
show global variables like '%binlog_format%';
>>>>>>> merge-perfschema-5.7
show global variables like 'binlog_format%';
Variable_name Value
binlog_format MIXED
drop table if exists test.marker;
@ -48,11 +44,7 @@ Expect 1
#
connection master;
<<<<<<< HEAD
show variables like 'binlog_format%';
=======
show global variables like '%binlog_format%';
>>>>>>> merge-perfschema-5.7
show global variables like 'binlog_format%';
Variable_name Value
binlog_format MIXED
*** Clear statement events