diff options
| author | sjaakola <seppo.jaakola@iki.fi> | 2017-07-27 11:39:31 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2017-09-15 09:22:54 +0300 |
| commit | ed9f68f6ad3417f4e12acd8c108a3fd9cc727111 (patch) | |
| tree | 13ac0cf616c9b9f63aa73c604e48e68503d7015f /sql/wsrep_mysqld.h | |
| parent | f3435fc37e7e0cfd5384c609d16b0d6cc3048454 (diff) | |
| download | mariadb-git-ed9f68f6ad3417f4e12acd8c108a3fd9cc727111.tar.gz | |
MW-394
* changed thd_binlog_format to return configured binlog format in wsrep execution,
regardless of binlogging setting (i.e. with or without binlogging)
* thd_binlog_format is used in innobase::write_row(), and would return confusing
result there when log_bin==OFF
Diffstat (limited to 'sql/wsrep_mysqld.h')
| -rw-r--r-- | sql/wsrep_mysqld.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/wsrep_mysqld.h b/sql/wsrep_mysqld.h index 3d46e17af99..f154b51516b 100644 --- a/sql/wsrep_mysqld.h +++ b/sql/wsrep_mysqld.h @@ -320,6 +320,10 @@ bool wsrep_create_like_table(THD* thd, TABLE_LIST* table, bool wsrep_node_is_donor(); bool wsrep_node_is_synced(); +#define WSREP_BINLOG_FORMAT(my_format) \ + ((wsrep_forced_binlog_format != BINLOG_FORMAT_UNSPEC) ? \ + wsrep_forced_binlog_format : my_format) + #else /* WITH_WSREP */ #define WSREP(T) (0) @@ -349,6 +353,7 @@ bool wsrep_node_is_synced(); #define wsrep_thr_init() do {} while(0) #define wsrep_thr_deinit() do {} while(0) #define wsrep_running_threads (0) +#define WSREP_BINLOG_FORMAT(my_format) my_format #endif /* WITH_WSREP */ #endif /* WSREP_MYSQLD_H */ |