database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

MDEV-8590: Fix embedded build failure

Browse Source
This commit is contained in:
Nirbhay Choubey
2015-08-09 14:16:50 -04:00
parent cd1a11ace3
commit 840aefc6a3
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/handler.cc
View File

@@ -5590,6 +5590,7 @@ static bool check_table_binlog_row_based(THD *thd, TABLE *table)
return (thd->is_current_stmt_binlog_format_row() && return (thd->is_current_stmt_binlog_format_row() &&
table->s->cached_row_logging_check && table->s->cached_row_logging_check &&
#ifdef WITH_WSREP
/* /*
Wsrep partially enables binary logging if it have not been Wsrep partially enables binary logging if it have not been
explicitly turned on. As a result we return 'true' if we are in 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_EMULATE_BINLOG(thd) && (thd->wsrep_exec_mode != REPL_RECV)) ||
((WSREP(thd) || (thd->variables.option_bits & OPTION_BIN_LOG)) && ((WSREP(thd) || (thd->variables.option_bits & OPTION_BIN_LOG)) &&
mysql_bin_log.is_open()))); mysql_bin_log.is_open())));
#else
(thd->variables.option_bits & OPTION_BIN_LOG) &&
mysql_bin_log.is_open());
#endif
} }