diff options
author | Monty <monty@mariadb.org> | 2020-01-29 16:41:04 +0200 |
---|---|---|
committer | Monty <monty@mariadb.org> | 2020-01-29 23:23:55 +0200 |
commit | 4d61f1247a1b6a86570cb03d3450930a78d689b3 (patch) | |
tree | e7b98495425ae73591c8c1f3cf81793196aca3ea /sql | |
parent | cd2c0e013ccb5f9b009743dfd7188585a539d9b5 (diff) | |
download | mariadb-git-4d61f1247a1b6a86570cb03d3450930a78d689b3.tar.gz |
Fixed compiler warnings from gcc 7.4.1
- Fixed possible error in rocksdb/rdb_datadic.cc
Diffstat (limited to 'sql')
-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 1e276d257da..d8d4b9a8d64 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -6115,7 +6115,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)) { |