diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-02-07 08:51:20 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-02-07 08:51:20 +0200 |
| commit | 8b6cfda631253c805687d94f2f1aaa17fd2ef0e2 (patch) | |
| tree | 9460953eeb7967bc56383bccc8c7af2adf81a694 /sql/sql_class.cc | |
| parent | 8b97eba31ba3b8af6a93b4836b14d52e1c377900 (diff) | |
| parent | c1eaa385ffb44bdf6264d2cc4b4cc0e10284c88a (diff) | |
| download | mariadb-git-8b6cfda631253c805687d94f2f1aaa17fd2ef0e2.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index b5054557c46..a0d2924009f 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -6226,7 +6226,7 @@ int THD::decide_logging_format(TABLE_LIST *tables) /* As all updated tables are temporary, nothing will be logged */ set_current_stmt_binlog_format_row(); } - else if (IF_WSREP((!WSREP(this) || + else if (IF_WSREP((!WSREP_NNULL(this) || wsrep_cs().mode() == wsrep::client_state::m_local),1)) { |