diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2018-08-02 20:35:44 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2018-08-02 20:35:44 +0300 |
| commit | 40f6bcb856ce05e15efd3070663af2686182147d (patch) | |
| tree | 98fcba54a1213f7b1c7492bfc272dd7055d52ede /sql | |
| parent | 9b29bda0d67ab15299659c9ad4046ab4f5ca7b6a (diff) | |
| download | mariadb-git-40f6bcb856ce05e15efd3070663af2686182147d.tar.gz | |
Add missing WSREP(thd) condition and remove unnecessary DBUG_RETURN.
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_alter.cc | 5 |
1 files 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: { |