diff options
| author | David Hows <david.hows@mongodb.com> | 2017-01-06 12:12:50 +1100 |
|---|---|---|
| committer | David Hows <david.hows@mongodb.com> | 2017-01-06 12:12:50 +1100 |
| commit | d48181f6f4db08761ed7b80b0332908b272ad0d0 (patch) | |
| tree | 38929fdcc5415ee7b001b6f1a406bd5bd777b737 /src/conn | |
| parent | 040e3d6f764c0fb626cb47fede54469f57d0c6e0 (diff) | |
| parent | 8d2324943364286056ae399043f70b8a937de312 (diff) | |
| download | mongo-d48181f6f4db08761ed7b80b0332908b272ad0d0.tar.gz | |
Merge branch 'mongodb-3.6' into mongodb-3.2mongodb-3.2.12
Diffstat (limited to 'src/conn')
| -rw-r--r-- | src/conn/conn_api.c | 3 | ||||
| -rw-r--r-- | src/conn/conn_handle.c | 1 | ||||
| -rw-r--r-- | src/conn/conn_open.c | 1 |
3 files changed, 0 insertions, 5 deletions
diff --git a/src/conn/conn_api.c b/src/conn/conn_api.c index 1bc4a501ce2..474b8bbad8a 100644 --- a/src/conn/conn_api.c +++ b/src/conn/conn_api.c @@ -2309,9 +2309,6 @@ wiredtiger_open(const char *home, WT_EVENT_HANDLER *event_handler, } WT_ERR(__wt_verbose_config(session, cfg)); - WT_ERR(__wt_config_gets(session, cfg, "hazard_max", &cval)); - conn->hazard_max = (uint32_t)cval.val; - WT_ERR(__wt_config_gets(session, cfg, "session_max", &cval)); conn->session_size = (uint32_t)cval.val + WT_EXTRA_INTERNAL_SESSIONS; diff --git a/src/conn/conn_handle.c b/src/conn/conn_handle.c index 3571cc60115..02182daa7dc 100644 --- a/src/conn/conn_handle.c +++ b/src/conn/conn_handle.c @@ -68,7 +68,6 @@ __wt_connection_init(WT_CONNECTION_IMPL *conn) session, &conn->hot_backup_lock, "hot backup")); WT_RET(__wt_calloc_def(session, WT_PAGE_LOCKS, &conn->page_lock)); - WT_CACHE_LINE_ALIGNMENT_VERIFY(session, conn->page_lock); for (i = 0; i < WT_PAGE_LOCKS; ++i) WT_RET( __wt_spin_init(session, &conn->page_lock[i], "btree page")); diff --git a/src/conn/conn_open.c b/src/conn/conn_open.c index 6454503d6cb..d4ace127bb2 100644 --- a/src/conn/conn_open.c +++ b/src/conn/conn_open.c @@ -30,7 +30,6 @@ __wt_connection_open(WT_CONNECTION_IMPL *conn, const char *cfg[]) /* WT_SESSION_IMPL array. */ WT_RET(__wt_calloc(session, conn->session_size, sizeof(WT_SESSION_IMPL), &conn->sessions)); - WT_CACHE_LINE_ALIGNMENT_VERIFY(session, conn->sessions); /* * Open the default session. We open this before starting service |