diff options
| author | Keith Bostic <keith@wiredtiger.com> | 2013-10-15 10:25:26 -0400 |
|---|---|---|
| committer | Keith Bostic <keith@wiredtiger.com> | 2013-10-15 10:25:26 -0400 |
| commit | 4059ba4627ab296299c6dda5c7349e8d09320ee3 (patch) | |
| tree | 52aaab83bedc5978cd9493780883f154d945da53 /dist | |
| parent | fef423751732b45a446f8fe6b5a74460eb186d9c (diff) | |
| parent | 9b3c8b84642c4572dfb5d7eefbf51f5d3378f62f (diff) | |
| download | mongo-4059ba4627ab296299c6dda5c7349e8d09320ee3.tar.gz | |
Merge branch 'develop' into mutex-logging
Diffstat (limited to 'dist')
| -rw-r--r-- | dist/api_data.py | 4 | ||||
| -rw-r--r-- | dist/s_string.ok | 1 | ||||
| -rw-r--r-- | dist/s_style | 5 | ||||
| -rw-r--r-- | dist/serial.py | 3 |
4 files changed, 1 insertions, 12 deletions
diff --git a/dist/api_data.py b/dist/api_data.py index d4ef5a17e96..8a15a14b5a5 100644 --- a/dist/api_data.py +++ b/dist/api_data.py @@ -110,10 +110,6 @@ lsm_config = [ the number of hash values per item used for LSM bloom filters''', min='2', max='100'), - Config('lsm_bloom_newest', 'false', r''' - create a bloom filter on an LSM tree chunk before its first - merge. Only supported if bloom filters are enabled''', - type='boolean'), Config('lsm_bloom_oldest', 'false', r''' create a bloom filter on the oldest LSM tree chunk. Only supported if bloom filters are enabled''', diff --git a/dist/s_string.ok b/dist/s_string.ok index 41deed97f3d..0b6cf922f4e 100644 --- a/dist/s_string.ok +++ b/dist/s_string.ok @@ -698,6 +698,7 @@ realloc recno recnos recsize +reinitialization req rescan resize diff --git a/dist/s_style b/dist/s_style index 126196424da..567dd1655c3 100644 --- a/dist/s_style +++ b/dist/s_style @@ -31,11 +31,6 @@ for f in `find examples ext src test -name '*.[chisy]' -o -name '*.in' | cat $t fi - if egrep '%l[diouxXn]|%[diouxXn]l' $f > $t; then - echo "$f: incorrect or dangerous printf format: %l[diouxXn]" - cat $t - fi - if grep "(unsigned)" $f > $t; then echo "$f: (unsigned) cast is wrong" cat $t diff --git a/dist/serial.py b/dist/serial.py index 2cae09942c0..e6c45b36a77 100644 --- a/dist/serial.py +++ b/dist/serial.py @@ -19,7 +19,6 @@ Serial('col_append', [ SerialArg('WT_PAGE *', 'page'), SerialArg('WT_INSERT_HEAD *', 'inshead'), SerialArg('WT_INSERT ***', 'ins_stack'), - SerialArg('WT_INSERT **', 'next_stack'), SerialArg('WT_INSERT *', 'new_ins', 1), SerialArg('uint64_t *', 'recno'), SerialArg('u_int', 'skipdepth'), @@ -29,7 +28,6 @@ Serial('insert', [ SerialArg('WT_PAGE *', 'page'), SerialArg('WT_INSERT_HEAD *', 'inshead'), SerialArg('WT_INSERT ***', 'ins_stack'), - SerialArg('WT_INSERT **', 'next_stack'), SerialArg('WT_INSERT *', 'new_ins', 1), SerialArg('u_int', 'skipdepth'), ]), @@ -37,7 +35,6 @@ Serial('insert', [ Serial('update', [ SerialArg('WT_PAGE *', 'page'), SerialArg('WT_UPDATE **', 'srch_upd'), - SerialArg('WT_UPDATE *', 'old_upd'), SerialArg('WT_UPDATE *', 'upd', 1), SerialArg('WT_UPDATE **', 'upd_obsolete'), ]), |