diff options
| author | Michael Cahill <michael.cahill@wiredtiger.com> | 2012-09-28 17:39:45 +1000 |
|---|---|---|
| committer | Michael Cahill <michael.cahill@wiredtiger.com> | 2012-09-28 17:39:45 +1000 |
| commit | 4be1afdf665bf4bd4449910049fcb0c0ccb9286e (patch) | |
| tree | 43388e016235ac31f5c9a51e58e0325162ac52ec /src/conn | |
| parent | 952577567aaaeb2076d445b18fb88d28a2e8da67 (diff) | |
| parent | c8a4341d852d323d0029b0b0a1e48a58ab2f23b6 (diff) | |
| download | mongo-4be1afdf665bf4bd4449910049fcb0c0ccb9286e.tar.gz | |
Merge branch 'develop' into data-handles
Conflicts:
src/btree/bt_evict.c
Diffstat (limited to 'src/conn')
| -rw-r--r-- | src/conn/conn_handle.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/conn/conn_handle.c b/src/conn/conn_handle.c index 4b393d1550d..d673a37cfc5 100644 --- a/src/conn/conn_handle.c +++ b/src/conn/conn_handle.c @@ -73,8 +73,9 @@ __wt_connection_destroy(WT_CONNECTION_IMPL *conn) __wt_spin_destroy(session, &conn->api_lock); __wt_spin_destroy(session, &conn->fh_lock); - __wt_spin_destroy(session, &conn->serial_lock); + __wt_spin_destroy(session, &conn->metadata_lock); __wt_spin_destroy(session, &conn->schema_lock); + __wt_spin_destroy(session, &conn->serial_lock); /* Free allocated memory. */ __wt_free(session, conn->home); |