summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNirbhay Choubey <nirbhay@mariadb.com>2015-08-09 14:16:50 -0400
committerNirbhay Choubey <nirbhay@mariadb.com>2015-08-09 14:16:50 -0400
commit840aefc6a34a57c572fc6c37ea16648e8dd6a1e6 (patch)
tree9c7c01e8940d8985a31bc141691225a187ba213e
parentcd1a11ace3b4a4b034307590d58cc7a9d37004f6 (diff)
downloadmariadb-git-840aefc6a34a57c572fc6c37ea16648e8dd6a1e6.tar.gz
MDEV-8590: Fix embedded build failure
-rw-r--r--sql/handler.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/handler.cc b/sql/handler.cc
index 705b760732e..51deee44eb6 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -5590,6 +5590,7 @@ static bool check_table_binlog_row_based(THD *thd, TABLE *table)
return (thd->is_current_stmt_binlog_format_row() &&
table->s->cached_row_logging_check &&
+#ifdef WITH_WSREP
/*
Wsrep partially enables binary logging if it have not been
explicitly turned on. As a result we return 'true' if we are in
@@ -5608,6 +5609,10 @@ static bool check_table_binlog_row_based(THD *thd, TABLE *table)
((WSREP_EMULATE_BINLOG(thd) && (thd->wsrep_exec_mode != REPL_RECV)) ||
((WSREP(thd) || (thd->variables.option_bits & OPTION_BIN_LOG)) &&
mysql_bin_log.is_open())));
+#else
+ (thd->variables.option_bits & OPTION_BIN_LOG) &&
+ mysql_bin_log.is_open());
+#endif
}