diff options
| author | Keith Bostic <keith@wiredtiger.com> | 2015-04-21 06:54:35 -0400 |
|---|---|---|
| committer | Keith Bostic <keith@wiredtiger.com> | 2015-04-21 06:54:35 -0400 |
| commit | b6eccf666cf5fe3248033047aac0daee2ec1c148 (patch) | |
| tree | d7a0c3b9f63ab5135319c27413919cb973b7d4cc /test | |
| parent | 2b072393cf184ff2486ab0f31fa57a5e2580a48d (diff) | |
| parent | 83444a571c9704ee64164ecb892052493f891f1f (diff) | |
| download | mongo-b6eccf666cf5fe3248033047aac0daee2ec1c148.tar.gz | |
Merge branch 'develop' into merge-config-early
Diffstat (limited to 'test')
| -rw-r--r-- | test/format/ops.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/format/ops.c b/test/format/ops.c index e338860fb75..9232fc41a33 100644 --- a/test/format/ops.c +++ b/test/format/ops.c @@ -90,7 +90,7 @@ wts_ops(int lastrun) if (g.c_timer == 0) fourths = -1; else - fourths = (g.c_timer * 4 * 60) / FORMAT_OPERATION_REPS; + fourths = ((int64_t)g.c_timer * 4 * 60) / FORMAT_OPERATION_REPS; /* Initialize the table extension code. */ table_append_init(); @@ -486,7 +486,7 @@ skip_insert: if (col_update(cursor, &key, &value, keyno)) goto deadlock; /* Reset the cursor: there is no reason to keep pages pinned. */ - if (cursor != NULL && (ret = cursor->reset(cursor)) != 0) + if ((ret = cursor->reset(cursor)) != 0) die(ret, "cursor.reset"); /* |