diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-09-17 14:03:51 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-09-17 14:03:51 +0300 |
| commit | fe949504f0894686d434c6fbdac25efeb965253d (patch) | |
| tree | 11bf92cdbb0c0454453c5e920d0a833cb35ecf4e /sql/sql_class.cc | |
| parent | ca906fb27361f615a1c21d5ae61c312d9ab0dd87 (diff) | |
| parent | 72c838b9fc3e5e9495d3c8e363ba85304b9db39a (diff) | |
| download | mariadb-git-fe949504f0894686d434c6fbdac25efeb965253d.tar.gz | |
Merge 10.2 into bb-10.2-ext
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index f4f67ab9244..1e69535d00c 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -4951,9 +4951,15 @@ extern "C" int thd_non_transactional_update(const MYSQL_THD thd) extern "C" int thd_binlog_format(const MYSQL_THD thd) { - if (((WSREP(thd) && wsrep_emulate_bin_log) || mysql_bin_log.is_open()) && - thd->variables.option_bits & OPTION_BIN_LOG) - return (int) thd->wsrep_binlog_format(); +#ifdef WITH_WSREP + if (WSREP(thd)) + { + /* for wsrep binlog format is meaningful also when binlogging is off */ + return (int) WSREP_BINLOG_FORMAT(thd->variables.binlog_format); + } +#endif /* WITH_WSREP */ + if (mysql_bin_log.is_open() && (thd->variables.option_bits & OPTION_BIN_LOG)) + return (int) thd->variables.binlog_format; else return BINLOG_FORMAT_UNSPEC; } |