diff options
Diffstat (limited to 'mysql-test/suite/perfschema/r/rpl_statements.result')
| -rw-r--r-- | mysql-test/suite/perfschema/r/rpl_statements.result | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/mysql-test/suite/perfschema/r/rpl_statements.result b/mysql-test/suite/perfschema/r/rpl_statements.result index c2b9ad7d514..d72402bf691 100644 --- a/mysql-test/suite/perfschema/r/rpl_statements.result +++ b/mysql-test/suite/perfschema/r/rpl_statements.result @@ -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 |