diff options
| author | Keith Bostic <keith@wiredtiger.com> | 2015-11-14 08:38:42 -0500 |
|---|---|---|
| committer | Keith Bostic <keith@wiredtiger.com> | 2015-11-14 08:38:42 -0500 |
| commit | 463726a1f555d930ee8c73ed59fe253275c899f1 (patch) | |
| tree | 7587813b77a36bf325988bd264e9f97cf659406d | |
| parent | 9464fe317f1b37a78c7201f2e5e7fa6173a3af70 (diff) | |
| parent | fccae5f0728fbdbd9aad98176d78a013ab1f3fd2 (diff) | |
| download | mongo-463726a1f555d930ee8c73ed59fe253275c899f1.tar.gz | |
Merge branch 'wt-2182-split-up-the-tree-2' into wt-2182-keith
| -rw-r--r-- | src/include/mutex.i | 2 | ||||
| -rw-r--r-- | test/recovery/recovery.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/include/mutex.i b/src/include/mutex.i index 54a9cc6f9fd..843c4ad9350 100644 --- a/src/include/mutex.i +++ b/src/include/mutex.i @@ -329,7 +329,7 @@ __wt_fair_unlock(WT_SESSION_IMPL *session, WT_FAIR_LOCK *lock) #ifdef HAVE_DIAGNOSTIC /* * __wt_fair_islocked -- - * Test whether the lock is currently held + * Test whether the lock is currently held. */ static inline bool __wt_fair_islocked(WT_SESSION_IMPL *session, WT_FAIR_LOCK *lock) diff --git a/test/recovery/recovery.c b/test/recovery/recovery.c index b888973d048..f7fbf76038b 100644 --- a/test/recovery/recovery.c +++ b/test/recovery/recovery.c @@ -64,7 +64,7 @@ usage(void) * the table until it is killed by the parent. */ static void -fill_db() +fill_db(void) { FILE *fp; WT_CONNECTION *conn; |