Commit 3ccd6766 authored by Julius Goryavsky's avatar Julius Goryavsky

Fixed compilation error in DCMAKE_BUILD_TYPE=mysql_release mode when WSREP enabled

parent 648b5474
...@@ -49,6 +49,7 @@ extern uchar *debug_sync_value_ptr(THD *thd); ...@@ -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_init_thread(THD *thd) {}
static inline void debug_sync_end_thread(THD *thd) {} static inline void debug_sync_end_thread(THD *thd) {}
static inline void debug_sync_reset_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 /* defined(ENABLED_DEBUG_SYNC) */
#endif /* DEBUG_SYNC_INCLUDED */ #endif /* DEBUG_SYNC_INCLUDED */
...@@ -507,6 +507,8 @@ int Wsrep_applier_service::apply_write_set(const wsrep::ws_meta& ws_meta, ...@@ -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); DBUG_ASSERT(thd->wsrep_trx().state() == wsrep::transaction::s_executing);
thd_proc_info(thd, "applying write set"); thd_proc_info(thd, "applying write set");
#ifdef ENABLED_DEBUG_SYNC
/* moved dbug sync point here, after possible THD switch for SR transactions /* moved dbug sync point here, after possible THD switch for SR transactions
has ben done has ben done
*/ */
...@@ -520,6 +522,7 @@ int Wsrep_applier_service::apply_write_set(const wsrep::ws_meta& ws_meta, ...@@ -520,6 +522,7 @@ int Wsrep_applier_service::apply_write_set(const wsrep::ws_meta& ws_meta,
DBUG_ASSERT(!debug_sync_set_action(thd, DBUG_ASSERT(!debug_sync_set_action(thd,
STRING_WITH_LEN(act))); STRING_WITH_LEN(act)));
};); };);
#endif
wsrep_setup_uk_and_fk_checks(thd); wsrep_setup_uk_and_fk_checks(thd);
int ret= apply_events(thd, m_rli, data, err); int ret= apply_events(thd, m_rli, data, err);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment