diff options
| author | Alex Gorrod <alexander.gorrod@mongodb.com> | 2017-06-27 12:01:10 +1000 |
|---|---|---|
| committer | Alex Gorrod <alexander.gorrod@mongodb.com> | 2017-06-27 12:01:10 +1000 |
| commit | 95d911ab246e444192f34dc395652dba2653dd3c (patch) | |
| tree | 8e7c4692125a841a486607ccfe26e8499bc4c398 /src/include/log.h | |
| parent | 19cd4d9be2c0fd980c00bb04bc949970002f5cb2 (diff) | |
| parent | d139a5d5be1d7ba94130502b379a61a809e66272 (diff) | |
| download | mongo-95d911ab246e444192f34dc395652dba2653dd3c.tar.gz | |
Merge branch 'mongodb-3.6'2.9.3
Diffstat (limited to 'src/include/log.h')
| -rw-r--r-- | src/include/log.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/include/log.h b/src/include/log.h index fb3c961417f..e7bc28cd220 100644 --- a/src/include/log.h +++ b/src/include/log.h @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2014-2016 MongoDB, Inc. + * Copyright (c) 2014-2017 MongoDB, Inc. * Copyright (c) 2008-2014 WiredTiger, Inc. * All rights reserved. * @@ -130,7 +130,7 @@ union __wt_lsn { #define WT_LOG_SLOT_FLAGS(state) ((state) & WT_LOG_SLOT_MASK_ON) #define WT_LOG_SLOT_JOINED(state) (((state) & WT_LOG_SLOT_MASK_OFF) >> 32) #define WT_LOG_SLOT_JOINED_BUFFERED(state) \ - (WT_LOG_SLOT_JOINED(state) & \ + (WT_LOG_SLOT_JOINED(state) & \ (WT_LOG_SLOT_UNBUFFERED - 1)) #define WT_LOG_SLOT_JOIN_REL(j, r, s) (((j) << 32) + (r) + (s)) #define WT_LOG_SLOT_RELEASED(state) ((int64_t)(int32_t)(state)) |