summaryrefslogtreecommitdiff
path: root/sql/wsrep_thd.h
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2014-09-25 23:00:45 +0200
committerSergei Golubchik <serg@mariadb.org>2014-10-01 23:38:27 +0200
commit3620910eeac8f118c9a6cb8a1c0ec23e56fb5d98 (patch)
treed08462d84d10324bd05836c968288d8ab1739e11 /sql/wsrep_thd.h
parentb04f848176b0d8af41eb3627ba1b6ed4dd3327e3 (diff)
downloadmariadb-git-3620910eeac8f118c9a6cb8a1c0ec23e56fb5d98.tar.gz
cleanup: galera merge, simple changes
Diffstat (limited to 'sql/wsrep_thd.h')
-rw-r--r--sql/wsrep_thd.h13
1 files changed, 12 insertions, 1 deletions
diff --git a/sql/wsrep_thd.h b/sql/wsrep_thd.h
index c5a497bb428..cc3a7c7b9d1 100644
--- a/sql/wsrep_thd.h
+++ b/sql/wsrep_thd.h
@@ -13,9 +13,13 @@
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */
-#if !defined(WSREP_THD_H) && defined(WITH_WSREP)
+#include <my_config.h>
+
+#ifndef WSREP_THD_H
#define WSREP_THD_H
+#ifdef WITH_WSREP
+
#include "sql_class.h"
int wsrep_show_bf_aborts (THD *thd, SHOW_VAR *var, char *buff);
@@ -37,4 +41,11 @@ extern "C" my_bool wsrep_thd_is_BF_or_commit(void *thd_ptr, my_bool sync);
extern "C" my_bool wsrep_thd_is_local(void *thd_ptr, my_bool sync);
extern "C" int wsrep_thd_in_locking_session(void *thd_ptr);
+#else /* WITH_WSREP */
+
+#define wsrep_thd_is_BF(T, S) (0)
+#define wsrep_abort_thd(X,Y,Z) do { } while(0)
+#define wsrep_create_appliers(T) (0)
+
+#endif
#endif /* WSREP_THD_H */