Conditionally define TRX_WSREP_ABORT

MariaDB · Mar 16, 2018 · 7033af9 · 7033af9
1 parent ca40330
commit 7033af9
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 10 deletions.
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
@@ -4917,8 +4917,10 @@ static void innobase_kill_query(handlerton*, THD* thd, enum thd_kill_levels)
 		ut_ad(trx->mysql_thd == thd);
 
 		switch (trx->abort_type) {
+#ifdef WITH_WSREP
 		case TRX_WSREP_ABORT:
 			break;
+#endif
 		case TRX_SERVER_ABORT:
 			if (!wsrep_thd_is_BF(trx->mysql_thd, FALSE)) {
 				lock_mutex_enter();
@@ -4930,8 +4932,10 @@ static void innobase_kill_query(handlerton*, THD* thd, enum thd_kill_levels)
 		/* Cancel a pending lock request if there are any */
 		lock_trx_handle_wait(trx);
 		switch (trx->abort_type) {
+#ifdef WITH_WSREP
 		case TRX_WSREP_ABORT:
 			break;
+#endif
 		case TRX_SERVER_ABORT:
 			if (!wsrep_thd_is_BF(trx->mysql_thd, FALSE)) {
 				lock_mutex_exit();

diff --git a/storage/innobase/include/trx0trx.h b/storage/innobase/include/trx0trx.h
@@ -1,7 +1,7 @@
 /*****************************************************************************
 
 Copyright (c) 1996, 2016, Oracle and/or its affiliates. All Rights Reserved.
-Copyright (c) 2015, 2017, MariaDB Corporation.
+Copyright (c) 2015, 2018, MariaDB Corporation.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -695,11 +695,13 @@ lock_rec_convert_impl_to_expl()) will access transactions associated
 to other connections. The locks of transactions are protected by
 lock_sys->mutex and sometimes by trx->mutex. */
 
-typedef enum {
+enum trx_abort_t {
 	TRX_SERVER_ABORT = 0,
-	TRX_WSREP_ABORT  = 1,
-	TRX_REPLICATION_ABORT = 2
-} trx_abort_t;
+#ifdef WITH_WSREP
+	TRX_WSREP_ABORT,
+#endif
+	TRX_REPLICATION_ABORT
+};
 
 struct trx_t{
 	ulint		magic_n;

diff --git a/storage/xtradb/handler/ha_innodb.cc b/storage/xtradb/handler/ha_innodb.cc
@@ -5513,8 +5513,10 @@ static void innobase_kill_query(handlerton*, THD* thd, enum thd_kill_levels)
 		ut_ad(trx->mysql_thd == thd);
 
 		switch (trx->abort_type) {
+#ifdef WITH_WSREP
 		case TRX_WSREP_ABORT:
 			break;
+#endif
 		case TRX_SERVER_ABORT:
 			if (!wsrep_thd_is_BF(trx->mysql_thd, FALSE)) {
 				lock_mutex_enter();
@@ -5526,8 +5528,10 @@ static void innobase_kill_query(handlerton*, THD* thd, enum thd_kill_levels)
 		/* Cancel a pending lock request if there are any */
 		lock_trx_handle_wait(trx);
 		switch (trx->abort_type) {
+#ifdef WITH_WSREP
 		case TRX_WSREP_ABORT:
 			break;
+#endif
 		case TRX_SERVER_ABORT:
 			if (!wsrep_thd_is_BF(trx->mysql_thd, FALSE)) {
 				lock_mutex_exit();

diff --git a/storage/xtradb/include/trx0trx.h b/storage/xtradb/include/trx0trx.h
@@ -1,7 +1,7 @@
 /*****************************************************************************
 
 Copyright (c) 1996, 2016, Oracle and/or its affiliates. All Rights Reserved.
-Copyright (c) 2015, 2017, MariaDB Corporation
+Copyright (c) 2015, 2018, MariaDB Corporation.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -744,11 +744,13 @@ lock_rec_convert_impl_to_expl()) will access transactions associated
 to other connections. The locks of transactions are protected by
 lock_sys->mutex and sometimes by trx->mutex. */
 
-typedef enum {
+enum trx_abort_t {
 	TRX_SERVER_ABORT = 0,
-	TRX_WSREP_ABORT  = 1,
-	TRX_REPLICATION_ABORT = 2
-} trx_abort_t;
+#ifdef WITH_WSREP
+	TRX_WSREP_ABORT,
+#endif
+	TRX_REPLICATION_ABORT
+};
 
 struct trx_t{
 	ulint		magic_n;