diff options
| author | Jan Lindström <jan.lindstrom@skysql.com> | 2014-08-06 15:39:15 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@skysql.com> | 2014-08-26 15:43:46 +0300 |
| commit | df4dd593f29aec8e2116aec1775ad4b8833d8c93 (patch) | |
| tree | becae67f02054e15ead58e929e91c044f0b7aa15 /mysql-test/suite/perfschema/r/rpl_statements.result | |
| parent | e974b564389af8251c2ba51060e6129e45431586 (diff) | |
| download | mariadb-git-df4dd593f29aec8e2116aec1775ad4b8833d8c93.tar.gz | |
MDEV-6247: Merge 10.0-galera to 10.1.
Merged lp:maria/maria-10.0-galera up to revision 3879.
Added a new functions to handler API to forcefully abort_transaction,
producing fake_trx_id, get_checkpoint and set_checkpoint for XA. These
were added for future possiblity to add more storage engines that
could use galera replication.
Diffstat (limited to 'mysql-test/suite/perfschema/r/rpl_statements.result')
| -rw-r--r-- | mysql-test/suite/perfschema/r/rpl_statements.result | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mysql-test/suite/perfschema/r/rpl_statements.result b/mysql-test/suite/perfschema/r/rpl_statements.result index e271cd2a7fa..211a7d3398d 100644 --- a/mysql-test/suite/perfschema/r/rpl_statements.result +++ b/mysql-test/suite/perfschema/r/rpl_statements.result @@ -11,9 +11,10 @@ include/master-slave.inc *** Create test tables -show variables like '%binlog_format%'; +show variables like 'binlog_format%'; Variable_name Value binlog_format MIXED +wsrep_forced_binlog_format NONE drop table if exists test.marker; select thread_id into @my_thread_id from performance_schema.threads @@ -55,9 +56,10 @@ Expect 1 *** MASTER *** ************** -show variables like '%binlog_format%'; +show variables like 'binlog_format%'; Variable_name Value binlog_format MIXED +wsrep_forced_binlog_format NONE *** Clear statement events *** Create/drop table, create/drop database |