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

MW-394

Browse Source 
MariaDB adjustments.
This commit is contained in:
Jan Lindström
2017-11-08 13:55:09 +02:00
parent 7cedebb99b
commit e5e33db5fb
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_class.cc
View File

@ -4772,11 +4772,11 @@ extern "C" int thd_binlog_format(const MYSQL_THD thd)
if (WSREP(thd)) if (WSREP(thd))
{ {
/* for wsrep binlog format is meaningful also when binlogging is off */ /* for wsrep binlog format is meaningful also when binlogging is off */
return (int) WSREP_BINLOG_FORMAT(thd->variables.binlog_format); return (int) WSREP_FORMAT(thd->variables.binlog_format);
} }
#endif /* WITH_WSREP */ #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))
return (int) WSREP_FORMAT(thd->variables.binlog_format); return (int) thd->variables.binlog_format;
else else
return BINLOG_FORMAT_UNSPEC; return BINLOG_FORMAT_UNSPEC;
} }