diff options
| author | Luke Chen <luke.chen@mongodb.com> | 2019-08-01 10:34:36 +1000 |
|---|---|---|
| committer | Luke Chen <luke.chen@mongodb.com> | 2019-08-01 10:34:36 +1000 |
| commit | 8a4b8b9fb7121417d33e8b1dd99f696c2f4fd765 (patch) | |
| tree | c081094a03f66fa9d8fa29e31175e2e7f48c42f4 /src/third_party/wiredtiger/src/conn | |
| parent | 943da6c9cbf1b55b2bc7248d20f483bd5ff66bdf (diff) | |
| download | mongo-8a4b8b9fb7121417d33e8b1dd99f696c2f4fd765.tar.gz | |
Import wiredtiger: c29f4c6030e37794b8c2c1195829ba2d14954677 from branch mongodb-4.4
ref: 1055c64267..c29f4c6030
for: 4.3.1
WT-4858 Add compatibility support for gcc-9 and clang-8
WT-4917 Fix test/format where truncate operations not correctly compared with previous updates
WT-4946 Tighten up failure checks for cursor join
WT-4957 Revert part of a change about when pages are queued for urgent eviction
WT-4963 Add debugging for rare test hang
WT-5036 Fix test/format where tracking buffer wrap causes repeatable operation failure
Diffstat (limited to 'src/third_party/wiredtiger/src/conn')
| -rw-r--r-- | src/third_party/wiredtiger/src/conn/conn_capacity.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/third_party/wiredtiger/src/conn/conn_capacity.c b/src/third_party/wiredtiger/src/conn/conn_capacity.c index a75bdd259c4..38052a8e412 100644 --- a/src/third_party/wiredtiger/src/conn/conn_capacity.c +++ b/src/third_party/wiredtiger/src/conn/conn_capacity.c @@ -270,8 +270,7 @@ __capacity_reserve(uint64_t *reservation, uint64_t bytes, uint64_t capacity, * If the reservation clock is out of date, bring it * to within a second of a current time. */ - (void)__wt_atomic_store64(reservation, - (now_ns - WT_BILLION) + res_len); + *reservation = (now_ns - WT_BILLION) + res_len; } else res_value = now_ns; |