diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2015-12-19 13:53:43 +0200 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2015-12-19 14:14:16 +0200 |
| commit | e386523a41245d8b03f1338934c1aa965530e4fc (patch) | |
| tree | caa5f90d746515259ca82deb43994adbf64dd280 /storage | |
| parent | f39b9e04db1e71e72bfc19174f257db5147df440 (diff) | |
| download | mariadb-git-e386523a41245d8b03f1338934c1aa965530e4fc.tar.gz | |
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.
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/tokudb/ft-index/ft/txn/rollback.cc | 4 |
1 files changed, 1 insertions, 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); } |