diff options
| author | Jan Lindström <jan.lindstrom@skysql.com> | 2014-09-09 13:35:39 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@skysql.com> | 2014-09-09 13:39:16 +0300 |
| commit | 6748976d14882bfb6e1261eae635789ee95212a5 (patch) | |
| tree | 37a85d92d61348cf0f12d84193423d7fd0553403 | |
| parent | bf30585eaf29139ee471a348fc394162ca3333bd (diff) | |
| download | mariadb-git-6748976d14882bfb6e1261eae635789ee95212a5.tar.gz | |
Fix test failure on rpl_statements test by not listing wsrep variable.
| -rw-r--r-- | mysql-test/suite/perfschema/r/rpl_statements.result | 2 | ||||
| -rw-r--r-- | sql/sql_parse.cc | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/mysql-test/suite/perfschema/r/rpl_statements.result b/mysql-test/suite/perfschema/r/rpl_statements.result index 211a7d3398d..4e1f03643f1 100644 --- a/mysql-test/suite/perfschema/r/rpl_statements.result +++ b/mysql-test/suite/perfschema/r/rpl_statements.result @@ -14,7 +14,6 @@ include/master-slave.inc 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 @@ -59,7 +58,6 @@ Expect 1 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 diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 741ba08386d..4d6becff599 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -3275,10 +3275,11 @@ mysql_execute_command(THD *thd) /* in STATEMENT format, we probably have to replicate also temporary tables, like mysql replication does */ - if (WSREP_ON && (!thd->is_current_stmt_binlog_format_row() || - !(create_info.options & HA_LEX_CREATE_TMP_TABLE))) - WSREP_TO_ISOLATION_BEGIN(create_table->db, create_table->table_name, - NULL) + if (WSREP(thd) && (!thd->is_current_stmt_binlog_format_row() || + !(create_info.options & HA_LEX_CREATE_TMP_TABLE))) + { + WSREP_TO_ISOLATION_BEGIN(create_table->db, create_table->table_name, NULL) + } #endif /* WITH_WSREP */ /* Regular CREATE TABLE */ res= mysql_create_table(thd, create_table, |