Fix merge errors.

sql/handler.cc

@@ -3136,7 +3136,7 @@ int handler::update_auto_increment()
                                           variables->auto_increment_increment);
     auto_inc_intervals_count++;
     /* Row-based replication does not need to store intervals in binlog */
-    if (IF_WSREP((WSREP(thd) && (wsrep_emulate_bin_log || mysql_bin_log.is_open())), mysql_bin_log.is_open())
+    if (IF_WSREP(((WSREP(thd) && wsrep_emulate_bin_log ) || mysql_bin_log.is_open()), mysql_bin_log.is_open())
         && !thd->is_current_stmt_binlog_format_row())
       thd->auto_inc_intervals_in_cur_stmt_for_binlog.
         append(auto_inc_interval_for_cur_row.minimum(),
@@ -5760,8 +5760,9 @@ static bool check_table_binlog_row_based(THD *thd, TABLE *table)
           table->s->cached_row_logging_check &&
           (thd->variables.option_bits & OPTION_BIN_LOG) &&
           /* applier and replayer should not binlog */
-          (IF_WSREP((WSREP_EMULATE_BINLOG(thd) && (thd->wsrep_exec_mode != REPL_RECV)),0) ||
-           mysql_bin_log.is_open()));
+          (IF_WSREP((WSREP_EMULATE_BINLOG(thd) &&
+		    (thd->wsrep_exec_mode != REPL_RECV)) ||
+		     mysql_bin_log.is_open(), mysql_bin_log.is_open())));
 }
 
 
@@ -5863,7 +5864,7 @@ static int binlog_log_row(TABLE* table,
 
 #ifdef WITH_WSREP
   /* only InnoDB tables will be replicated through binlog emulation */
-  if (WSREP_ON && WSREP_EMULATE_BINLOG(thd) &&
+  if (WSREP_EMULATE_BINLOG(thd) &&
       table->file->partition_ht()->db_type != DB_TYPE_INNODB)
     return 0;
 #endif /* WITH_WSREP */

sql/log.cc

@@ -5829,8 +5829,7 @@ bool MYSQL_BIN_LOG::write(Log_event *event_info, my_bool *with_annotate)
      could have changed since.
   */
   /* applier and replayer can skip writing binlog events */
-  if (IF_WSREP((WSREP_EMULATE_BINLOG(thd) && (thd->wsrep_exec_mode != REPL_RECV)), 0) ||
-      likely(is_open()))
+  if (IF_WSREP((WSREP_EMULATE_BINLOG(thd) && (thd->wsrep_exec_mode != REPL_RECV)) || is_open(), likely(is_open())))
   {
     my_off_t UNINIT_VAR(my_org_b_tell);
 #ifdef HAVE_REPLICATION

sql/log_event.h

@@ -1344,7 +1344,6 @@ public:
     THD_STAGE_INFO(thd, stage_apply_event);
     res= do_apply_event(rgi);
     THD_STAGE_INFO(thd, stage_after_apply_event);
-    res= 0;
     return res;
   }
 

sql/mysqld.cc

@@ -1953,7 +1953,7 @@ static void __cdecl kill_server(int sig_ptr)
   close_connections();
 
 #ifdef WITH_WSREP
-  if (WSREP_ON && wsrep_inited == 1)
+  if (wsrep_inited == 1)
     wsrep_deinit(true);
 #endif
 
@@ -2754,7 +2754,7 @@ static void network_init(void)
     if (mysql_socket_listen(unix_sock,(int) back_log) < 0)
       sql_print_warning("listen() on Unix socket failed with error %d",
 		      socket_errno);
-#if defined(WITH_WSREP) && defined(HAVE_FCNTL)
+#if defined(WITH_WSREP) && defined(HAVE_FCNTL) && defined(FD_CLOEXEC)
     if (WSREP_ON)
       (void) fcntl(mysql_socket_getfd(unix_sock), F_SETFD, FD_CLOEXEC);
 #endif /* WITH_WSREP */
@@ -2837,7 +2837,7 @@ void dec_connection_count(THD *thd)
     Do not decrement when its wsrep system thread. wsrep_applier is set for
     applier as well as rollbacker threads.
   */
-  if (!thd->wsrep_applier)
+  if (thd->wsrep_applier)
     return;
 #endif /* WITH_WSREP */
 

sql/sql_class.cc

@@ -1951,7 +1951,7 @@ bool THD::notify_shared_lock(MDL_context_owner *ctx_in_use,
       {
         signalled|= mysql_lock_abort_for_thread(this, thd_table);
 #if WITH_WSREP
-        if (WSREP_ON && this && WSREP(this) && wsrep_thd_is_BF((void *)this, FALSE))
+        if (this && WSREP(this) && wsrep_thd_is_BF((void *)this, FALSE))
         {
           WSREP_DEBUG("remove_table_from_cache: %llu",
                       (unsigned long long) this->real_id);
@@ -2141,7 +2141,7 @@ void THD::cleanup_after_query()
   table_map_for_update= 0;
   m_binlog_invoker= INVOKER_NONE;
 #ifdef WITH_WSREP
-  if (WSREP_ON && TOTAL_ORDER == wsrep_exec_mode)
+  if (TOTAL_ORDER == wsrep_exec_mode)
   {
     wsrep_exec_mode = LOCAL_STATE;
   }
@@ -2569,7 +2569,7 @@ bool select_send::send_result_set_metadata(List<Item> &list, uint flags)
 {
   bool res;
 #ifdef WITH_WSREP
-  if (WSREP_ON && WSREP(thd) && thd->wsrep_retry_query)
+  if (WSREP(thd) && thd->wsrep_retry_query)
   {
     WSREP_DEBUG("skipping select metadata");
     return FALSE;
@@ -4320,9 +4320,9 @@ extern "C" int thd_non_transactional_update(const MYSQL_THD thd)
 
 extern "C" int thd_binlog_format(const MYSQL_THD thd)
 {
-    if (IF_WSREP(((WSREP(thd) &&  wsrep_emulate_bin_log) || mysql_bin_log.is_open()),
-        mysql_bin_log.is_open()) &&
-        thd->variables.option_bits & OPTION_BIN_LOG)
+  if (IF_WSREP(((WSREP(thd) &&  wsrep_emulate_bin_log) || mysql_bin_log.is_open()),
+      mysql_bin_log.is_open()) &&
+      thd->variables.option_bits & OPTION_BIN_LOG)
     return (int) WSREP_FORMAT(thd->variables.binlog_format);
   else
     return BINLOG_FORMAT_UNSPEC;
@@ -5309,7 +5309,7 @@ int THD::decide_logging_format(TABLE_LIST *tables)
             5. Error: Cannot modify table that uses a storage engine
                limited to row-logging when binlog_format = STATEMENT
           */
-	  if (IF_WSREP(WSREP_ON && (!WSREP(this) || wsrep_exec_mode == LOCAL_STATE),1))
+	  if (IF_WSREP((!WSREP(this) || wsrep_exec_mode == LOCAL_STATE),1))
 	  {
             my_error((error= ER_BINLOG_STMT_MODE_AND_ROW_ENGINE), MYF(0), "");
 	  }
@@ -5663,7 +5663,7 @@ int THD::binlog_write_row(TABLE* table, bool is_trans,
 {
 
   DBUG_ASSERT(is_current_stmt_binlog_format_row() &&
-    IF_WSREP(((WSREP_ON && WSREP(this) && wsrep_emulate_bin_log) || mysql_bin_log.is_open()),
+    IF_WSREP(((WSREP(this) && wsrep_emulate_bin_log) || mysql_bin_log.is_open()),
               mysql_bin_log.is_open()));
   /*
     Pack records into format for transfer. We are allocating more
@@ -5698,7 +5698,7 @@ int THD::binlog_update_row(TABLE* table, bool is_trans,
                            const uchar *after_record)
 {
   DBUG_ASSERT(is_current_stmt_binlog_format_row() &&
-    IF_WSREP(((WSREP_ON && WSREP(this) && wsrep_emulate_bin_log) || mysql_bin_log.is_open()),
+    IF_WSREP(((WSREP(this) && wsrep_emulate_bin_log) || mysql_bin_log.is_open()),
               mysql_bin_log.is_open()));
 
   size_t const before_maxlen = max_row_length(table, before_record);
@@ -5749,7 +5749,7 @@ int THD::binlog_delete_row(TABLE* table, bool is_trans,
                            uchar const *record)
 {
   DBUG_ASSERT(is_current_stmt_binlog_format_row() &&
-    IF_WSREP(((WSREP_ON && WSREP(this) && wsrep_emulate_bin_log) || mysql_bin_log.is_open()),
+    IF_WSREP(((WSREP(this) && wsrep_emulate_bin_log) || mysql_bin_log.is_open()),
               mysql_bin_log.is_open()));
 
   /* 
@@ -5785,7 +5785,7 @@ int THD::binlog_remove_pending_rows_event(bool clear_maps,
 {
   DBUG_ENTER("THD::binlog_remove_pending_rows_event");
 
-  IF_WSREP(WSREP_ON && !(WSREP_EMULATE_BINLOG(this) || mysql_bin_log.is_open()),
+  IF_WSREP(!(WSREP_EMULATE_BINLOG(this) || mysql_bin_log.is_open()),
     !mysql_bin_log.is_open());
     DBUG_RETURN(0);
 
@@ -5809,8 +5809,8 @@ int THD::binlog_flush_pending_rows_event(bool stmt_end, bool is_transactional)
     mode: it might be the case that we left row-based mode before
     flushing anything (e.g., if we have explicitly locked tables).
    */
-  IF_WSREP(WSREP_ON && !(WSREP_EMULATE_BINLOG(this) || mysql_bin_log.is_open()),
-    !mysql_bin_log.is_open());
+  if(IF_WSREP(!(WSREP_EMULATE_BINLOG(this) || mysql_bin_log.is_open()),
+              !mysql_bin_log.is_open()))
     DBUG_RETURN(0);
 
   /* Ensure that all events in a GTID group are in the same cache */
@@ -6064,7 +6064,7 @@ int THD::binlog_query(THD::enum_binlog_query_type qtype, char const *query_arg,
                        show_query_type(qtype), (int) query_len, query_arg));
 
   DBUG_ASSERT(query_arg &&
-    IF_WSREP(WSREP_ON && (WSREP_EMULATE_BINLOG(this) || mysql_bin_log.is_open()),
+    IF_WSREP((WSREP_EMULATE_BINLOG(this) || mysql_bin_log.is_open()),
              mysql_bin_log.is_open()));
 
   /* If this is withing a BEGIN ... COMMIT group, don't log it */

sql/sql_show.cc

@@ -2973,7 +2973,7 @@ static bool show_status_array(THD *thd, const char *wild,
       DBUG_ASSERT(name_buffer[0] <= 'z');
 
       // WSREP_TODO: remove once lp:1306875 has been addressed.
-      if (IF_WSREP(WSREP_ON && is_wsrep_var == FALSE, 1) &&
+      if (IF_WSREP(is_wsrep_var == FALSE, 1) &&
           status_var)
         name_buffer[0]-= 'a' - 'A';
     }