From e5e33db5fb5c895f715b3d7ce19eed0fd06a4b8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Lindstr=C3=B6m?= <jan.lindstrom@mariadb.com>
Date: Wed, 8 Nov 2017 13:55:09 +0200
Subject: [PATCH] MW-394

MariaDB adjustments.
---
 sql/sql_class.cc | 4 ++--
 1 file 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;
 }