diff options
| author | Michael Cahill <michael.cahill@wiredtiger.com> | 2014-04-23 17:39:14 +1000 |
|---|---|---|
| committer | Michael Cahill <michael.cahill@wiredtiger.com> | 2014-04-23 17:39:14 +1000 |
| commit | 5f41a111b2533e88c57e01d8d0ab27dd07a8aff7 (patch) | |
| tree | 354db98dba1421e29c3907e73ffa2635d3a8f82b /dist | |
| parent | a8e8d0e176d8576735e88c8a82278e5918aca309 (diff) | |
| parent | 6cd6c3efd8eeda539931b7d8dadaa98161572ccc (diff) | |
| download | mongo-5f41a111b2533e88c57e01d8d0ab27dd07a8aff7.tar.gz | |
Merge branch 'develop' into metadata-cursors
Diffstat (limited to 'dist')
| -rw-r--r-- | dist/api_data.py | 2 | ||||
| -rw-r--r-- | dist/filelist | 1 | ||||
| -rw-r--r-- | dist/flags.py | 1 | ||||
| -rw-r--r-- | dist/s_string.ok | 3 |
4 files changed, 6 insertions, 1 deletions
diff --git a/dist/api_data.py b/dist/api_data.py index c9b32fe1800..7490d9353d1 100644 --- a/dist/api_data.py +++ b/dist/api_data.py @@ -217,7 +217,7 @@ file_config = format_meta + [ constraining the number of keys processed to instantiate a random Btree leaf page key''', min='0', undoc=True), - Config('leaf_page_max', '1MB', r''' + Config('leaf_page_max', '32KB', r''' the maximum page size for leaf nodes, in bytes; the size must be a multiple of the allocation size, and is significant for applications wanting to maximize sequential data transfer from diff --git a/dist/filelist b/dist/filelist index 77c9439d15e..88ed285661f 100644 --- a/dist/filelist +++ b/dist/filelist @@ -22,6 +22,7 @@ src/btree/bt_curnext.c src/btree/bt_curprev.c src/btree/bt_cursor.c src/btree/bt_debug.c +src/btree/bt_delete.c src/btree/bt_discard.c src/btree/bt_evict.c src/btree/bt_handle.c diff --git a/dist/flags.py b/dist/flags.py index 3dd81ec934b..1c617d21baf 100644 --- a/dist/flags.py +++ b/dist/flags.py @@ -43,6 +43,7 @@ flags = { 'rec_write' : [ 'EVICTION_LOCKED', 'SKIP_UPDATE_ERR', + 'SKIP_UPDATE_OK', 'SKIP_UPDATE_RESTORE' ], 'shared_cache' : [ diff --git a/dist/s_string.ok b/dist/s_string.ok index 7c31e81ac66..dddb62f6b07 100644 --- a/dist/s_string.ok +++ b/dist/s_string.ok @@ -349,6 +349,7 @@ cfkos change's checkfrag checkpointed +checkpointer checkpointing checksum checksums @@ -658,6 +659,7 @@ namespaces nbits nbsp nclr +nd negint newbar newfile @@ -711,6 +713,7 @@ posix pre prealloc preload +prepend prepended prepending presize |