summaryrefslogtreecommitdiff
path: root/storage/innobase/include/trx0sys.h
diff options
context:
space:
mode:
authorSergey Vojtovich <svoj@mariadb.org>2018-12-28 01:47:17 +0400
committerSergey Vojtovich <svoj@mariadb.org>2018-12-28 13:24:11 +0400
commitdc90234bda3e2074179a3e54c09a7c9694e69965 (patch)
tree56511b90d36696d23153defeadda83e08a7a4d5b /storage/innobase/include/trx0sys.h
parent830a7c67a4eefa1091bad4b60617309b9f299c96 (diff)
downloadmariadb-git-dc90234bda3e2074179a3e54c09a7c9694e69965.tar.gz
MDEV-17441 - InnoDB transition to C++11 atomics
Added lf_hash_size() macro, so that callers don't need to use atomic operations.
Diffstat (limited to 'storage/innobase/include/trx0sys.h')
-rw-r--r--storage/innobase/include/trx0sys.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/storage/innobase/include/trx0sys.h b/storage/innobase/include/trx0sys.h
index e73cbb81c32..92f24d036ae 100644
--- a/storage/innobase/include/trx0sys.h
+++ b/storage/innobase/include/trx0sys.h
@@ -704,11 +704,7 @@ public:
because it may change even before this method returns.
*/
- uint32_t size()
- {
- return uint32_t(my_atomic_load32_explicit(&hash.count,
- MY_MEMORY_ORDER_RELAXED));
- }
+ uint32_t size() { return uint32_t(lf_hash_size(&hash)); }
/**