diff options
| author | Alex Gorrod <alexg@wiredtiger.com> | 2016-04-01 11:06:43 +1100 |
|---|---|---|
| committer | Alex Gorrod <alexg@wiredtiger.com> | 2016-04-01 11:06:43 +1100 |
| commit | 357bf28ba3fc1d5902b429a9e634015187f648ed (patch) | |
| tree | 4ba83c2204f623e36fb6d506904fb782f99ffff5 | |
| parent | 89cccb7ff3d68690a5672c652b3535f5dd1dd8e4 (diff) | |
| parent | 385b126a7d517afd7eb711b04d71bb3b5a03c917 (diff) | |
| download | mongo-357bf28ba3fc1d5902b429a9e634015187f648ed.tar.gz | |
Merge branch 'develop' into wt-2330
| -rw-r--r-- | src/log/log_slot.c | 2 | ||||
| -rw-r--r-- | test/mciproject.yml | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/log/log_slot.c b/src/log/log_slot.c index b78ef9fe4a7..b7efb1d9018 100644 --- a/src/log/log_slot.c +++ b/src/log/log_slot.c @@ -96,7 +96,7 @@ retry: slot->slot_end_lsn = slot->slot_start_lsn; end_offset = WT_LOG_SLOT_JOINED_BUFFERED(old_state) + slot->slot_unbuffered; - slot->slot_end_lsn.l.offset += end_offset; + slot->slot_end_lsn.l.offset += (uint32_t)end_offset; WT_STAT_FAST_CONN_INCRV(session, log_slot_consolidated, end_offset); /* * XXX Would like to change so one piece of code advances the LSN. diff --git a/test/mciproject.yml b/test/mciproject.yml index 49caa44438d..9abdf23ec3b 100644 --- a/test/mciproject.yml +++ b/test/mciproject.yml @@ -124,10 +124,10 @@ buildvariants: - name: compile-windows-alt - name: fops-windows -- name: osx-108 - display_name: OS X 10.8 +- name: osx-1010 + display_name: OS X 10.10 run_on: - - osx-108 + - osx-1010 expansions: smp_command: -j$(sysctl -n hw.logicalcpu) configure_env_vars: PATH=/opt/local/bin:$PATH |