revision-id: 21e5aca3e26a480a60c5e640a44a47601ba0a289 (mariadb-galera-10.0.35-16-g21e5aca3e26) parent(s): 9b29bda0d67ab15299659c9ad4046ab4f5ca7b6a author: Jan Lindström committer: Jan Lindström timestamp: 2018-08-02 18:35:20 +0300 message: Fix merge error. --- sql/sql_alter.cc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sql/sql_alter.cc b/sql/sql_alter.cc index 1129b209775..0bf2d4be2ad 100644 --- a/sql/sql_alter.cc +++ b/sql/sql_alter.cc @@ -308,7 +308,8 @@ bool Sql_cmd_alter_table::execute(THD *thd) #ifdef WITH_WSREP TABLE *find_temporary_table(THD *thd, const TABLE_LIST *tl); - if ((!thd->is_current_stmt_binlog_format_row() || + if (WSREP(thd) && + (!thd->is_current_stmt_binlog_format_row() || !find_temporary_table(thd, first_table))) { WSREP_TO_ISOLATION_BEGIN_ALTER(((lex->name.str) ? select_lex->db : NULL), @@ -329,8 +330,6 @@ bool Sql_cmd_alter_table::execute(THD *thd) lex->ignore); DBUG_RETURN(result); - - DBUG_RETURN(result); #ifdef WITH_WSREP error: {