database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

MW-394

Browse Source 
* 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
This commit is contained in:
sjaakola
2017-07-27 11:39:31 +03:00
committed by Jan Lindström
parent b79407c5e9
commit 7cedebb99b
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sql/sql_class.cc
View File

@ -4769,11 +4769,13 @@ extern "C" int thd_non_transactional_update(const MYSQL_THD thd)
extern "C" int thd_binlog_format(const MYSQL_THD thd) extern "C" int thd_binlog_format(const MYSQL_THD thd)
{ {
#ifdef WITH_WSREP #ifdef WITH_WSREP
if (((WSREP(thd) && wsrep_emulate_bin_log) || mysql_bin_log.is_open()) && if (WSREP(thd))
(thd->variables.option_bits & OPTION_BIN_LOG)) {
#else /* 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)) if (mysql_bin_log.is_open() && (thd->variables.option_bits & OPTION_BIN_LOG))
#endif
return (int) WSREP_FORMAT(thd->variables.binlog_format); return (int) WSREP_FORMAT(thd->variables.binlog_format);
else else
return BINLOG_FORMAT_UNSPEC; return BINLOG_FORMAT_UNSPEC;