diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2017-11-08 13:55:09 +0200 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2017-11-08 13:55:09 +0200 |
| commit | e5e33db5fb5c895f715b3d7ce19eed0fd06a4b8d (patch) | |
| tree | 583ba69d4617987ae4b8b3647b32f3f42e220a4f /sql | |
| parent | 7cedebb99bc26d26f2dc614e8246e8592d03bab9 (diff) | |
| download | mariadb-git-e5e33db5fb5c895f715b3d7ce19eed0fd06a4b8d.tar.gz | |
MW-394
MariaDB adjustments.
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_class.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 3aedbe72229..c7b55aa9b68 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -4772,11 +4772,11 @@ extern "C" int thd_binlog_format(const MYSQL_THD thd) if (WSREP(thd)) { /* 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 */ 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 return BINLOG_FORMAT_UNSPEC; } |