Fixed compilation error in DCMAKE_BUILD_TYPE=mysql_release mode when …

…WSREP enabled
MariaDB · Jun 10, 2020 · 3ccd676 · 3ccd676
1 parent 648b547
commit 3ccd676
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/sql/debug_sync.h b/sql/debug_sync.h
@@ -49,6 +49,7 @@ extern uchar *debug_sync_value_ptr(THD *thd);
 static inline void debug_sync_init_thread(THD *thd) {}
 static inline void debug_sync_end_thread(THD *thd) {}
 static inline void debug_sync_reset_thread(THD *thd) {}
+static bool debug_sync_set_action(THD *thd, const char *action_str, size_t len) {return false;}
 #endif /* defined(ENABLED_DEBUG_SYNC) */
 
 #endif /* DEBUG_SYNC_INCLUDED */
diff --git a/sql/wsrep_high_priority_service.cc b/sql/wsrep_high_priority_service.cc
@@ -507,6 +507,8 @@ int Wsrep_applier_service::apply_write_set(const wsrep::ws_meta& ws_meta,
   DBUG_ASSERT(thd->wsrep_trx().state() == wsrep::transaction::s_executing);
 
   thd_proc_info(thd, "applying write set");
+
+#ifdef ENABLED_DEBUG_SYNC
   /* moved dbug sync point here, after possible THD switch for SR transactions
      has ben done
   */
@@ -520,6 +522,7 @@ int Wsrep_applier_service::apply_write_set(const wsrep::ws_meta& ws_meta,
                    DBUG_ASSERT(!debug_sync_set_action(thd,
                                                       STRING_WITH_LEN(act)));
                  };);
+#endif
 
   wsrep_setup_uk_and_fk_checks(thd);
   int ret= apply_events(thd, m_rli, data, err);