[Commits] e386523: MDEV-7526: TokuDB doesn't build on OS X

Vicentiu Ciorbaru vicentiu at mariadb.org
Sat Dec 19 14:17:51 EET 2015


revision-id: e386523a41245d8b03f1338934c1aa965530e4fc (mariadb-5.5.47-10-ge386523)
parent(s): f39b9e04db1e71e72bfc19174f257db5147df440
author: Vicențiu Ciorbaru
committer: Vicențiu Ciorbaru
timestamp: 2015-12-19 14:14:16 +0200
message:

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 6204803..ea2f2a0 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);
 }
 


More information about the commits mailing list