From e386523a41245d8b03f1338934c1aa965530e4fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vicen=C8=9Biu=20Ciorbaru?= Date: Sat, 19 Dec 2015 13:53:43 +0200 Subject: [PATCH] MDEV-7526: TokuDB doesn't build on OS X Fixed compile warning related to if statement always being true. The if statement can not be false, as the address of a member field is always true. --- storage/tokudb/ft-index/ft/txn/rollback.cc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/storage/tokudb/ft-index/ft/txn/rollback.cc b/storage/tokudb/ft-index/ft/txn/rollback.cc index 62048039c26..ea2f2a07c50 100644 --- a/storage/tokudb/ft-index/ft/txn/rollback.cc +++ b/storage/tokudb/ft-index/ft/txn/rollback.cc @@ -147,9 +147,7 @@ static inline PAIR_ATTR make_rollback_pair_attr(long size) { PAIR_ATTR rollback_memory_size(ROLLBACK_LOG_NODE log) { size_t size = sizeof(*log); - if (&log->rollentry_arena) { - size += log->rollentry_arena.total_footprint(); - } + size += log->rollentry_arena.total_footprint(); return make_rollback_pair_attr(size); }