summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Gorrod <alexg@wiredtiger.com>2014-02-28 14:44:59 +1100
committerAlex Gorrod <alexg@wiredtiger.com>2014-02-28 14:44:59 +1100
commitb65409ff15ba9d154de19657609e68730e9fb461 (patch)
treeb88a91ffa933cd3a109f113070fd551a4b306adb
parent29c9412ec31962b153cff9d0afa3af12084df1c7 (diff)
downloadmongo-b65409ff15ba9d154de19657609e68730e9fb461.tar.gz
Switch || to && to fix build.
-rw-r--r--src/lsm/lsm_merge.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lsm/lsm_merge.c b/src/lsm/lsm_merge.c
index 66681148192..74e5e58df97 100644
--- a/src/lsm/lsm_merge.c
+++ b/src/lsm/lsm_merge.c
@@ -111,7 +111,7 @@ __wt_lsm_merge(
continue;
if (F_ISSET(chunk, WT_LSM_CHUNK_BLOOM))
break;
- else if (FLD_ISSET(lsm_tree->bloom, WT_LSM_BLOOM_OFF) ||
+ else if (FLD_ISSET(lsm_tree->bloom, WT_LSM_BLOOM_OFF) &&
F_ISSET(chunk, WT_LSM_CHUNK_ONDISK))
break;
}