summaryrefslogtreecommitdiff
path: root/storage/innobase/include/trx0trx.h
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2020-04-27 17:38:17 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2020-04-27 17:38:17 +0300
commitb63446984c2c8441c19fc646f6652a9bc3076304 (patch)
treea874d841721ba5d80f66e92e5e16dc0ab4233e2a /storage/innobase/include/trx0trx.h
parent6dab094fbd31ef93a1d51b1b9c867188b2f958c3 (diff)
parent3568fad5c935426a275900e8130657b18ba14e9f (diff)
downloadmariadb-git-b63446984c2c8441c19fc646f6652a9bc3076304.tar.gz
Merge 10.3 into 10.4
Diffstat (limited to 'storage/innobase/include/trx0trx.h')
-rw-r--r--storage/innobase/include/trx0trx.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/storage/innobase/include/trx0trx.h b/storage/innobase/include/trx0trx.h
index 738f725c60d..6911f2ec084 100644
--- a/storage/innobase/include/trx0trx.h
+++ b/storage/innobase/include/trx0trx.h
@@ -840,6 +840,13 @@ public:
Transitions to COMMITTED are protected by trx_t::mutex. */
trx_state_t state;
+#ifdef WITH_WSREP
+ /** whether wsrep_on(mysql_thd) held at the start of transaction */
+ bool wsrep;
+ bool is_wsrep() const { return UNIV_UNLIKELY(wsrep); }
+#else /* WITH_WSREP */
+ bool is_wsrep() const { return false; }
+#endif /* WITH_WSREP */
ReadView read_view; /*!< consistent read view used in the
transaction, or NULL if not yet set */