MW-394

MariaDB adjustments.

MW-394
MariaDB adjustments.
e5e33db5 · Jan Lindström · 7cedebb9 · e5e33db5
Commit e5e33db5 authored Nov 08, 2017 by Jan Lindström
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

sql/sql_class.cc sql/sql_class.cc +2 -2

No files found.
--- 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;
 }