From 7ee47ef456f5b462187e299b7d5af539e107a1e5 Mon Sep 17 00:00:00 2001 From: sjaakola Date: Wed, 10 May 2017 15:59:52 +0300 Subject: MW-378 enabling build with WITH_WSREP=OFF only one fix here, enables build of mysqld however, building embedded server fails in linking phase --- sql/handler.cc | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'sql/handler.cc') diff --git a/sql/handler.cc b/sql/handler.cc index 19f648219ac..6072a828ab6 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -1690,6 +1690,11 @@ int ha_rollback_trans(THD *thd, bool all) { // cannot happen my_error(ER_ERROR_DURING_ROLLBACK, MYF(0), err); error=1; +#ifdef WITH_WSREP + WSREP_WARN("handlerton rollback failed, thd %lu %lld conf %d SQL %s", + thd->thread_id, thd->query_id, thd->wsrep_conflict_state, + thd->query()); +#endif /* WITH_WSREP */ } status_var_increment(thd->status_var.ha_rollback_count); ha_info_next= ha_info->next(); -- cgit v1.2.1