diff options
| author | Michael Cahill <michael.cahill@wiredtiger.com> | 2014-04-07 15:39:23 +1000 |
|---|---|---|
| committer | Michael Cahill <michael.cahill@wiredtiger.com> | 2014-04-07 15:39:23 +1000 |
| commit | 5cba38f38295337bdd03ab4207865fa6599adcb0 (patch) | |
| tree | 5791f078561cc1d7b0e1ca65d4f2983a2fa5659d /dist/s_string.ok | |
| parent | 470b917857a9a5625800496a4af3e1918630778c (diff) | |
| parent | eb25e6fe933df6f2bde9f1acbdcd500af0f7a227 (diff) | |
| download | mongo-5cba38f38295337bdd03ab4207865fa6599adcb0.tar.gz | |
Merge branch 'develop' into async
Conflicts:
src/include/extern.h
src/include/wiredtiger.in
Diffstat (limited to 'dist/s_string.ok')
| -rw-r--r-- | dist/s_string.ok | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/dist/s_string.ok b/dist/s_string.ok index 43a2261faff..47c8cded5fc 100644 --- a/dist/s_string.ok +++ b/dist/s_string.ok @@ -121,6 +121,7 @@ INIT INITIALIZER INMEM INSERT's +INTL INUSE ISSET ITEMs @@ -200,6 +201,7 @@ RCS READONLY RECNO REF's +REFs REQ RET RLE @@ -250,6 +252,8 @@ UID UIDs UINT ULINE +UPD +UPDATEs URI URIs UTF @@ -344,6 +348,7 @@ calloc catfmt cb cd +centric cfg cfkos change's @@ -392,6 +397,7 @@ curconfig curdump curfile curindex +cursoring cursorp curstat curtable @@ -494,6 +500,7 @@ fmterr fnv foc fopen +fotxn fp fprintf free'd @@ -639,6 +646,8 @@ mnt msg msgv mtx +multi +multiblock multicore multiprocess multisocket @@ -685,6 +694,7 @@ numSymbols numbare oc offpage +oindex ok oldname onint @@ -710,6 +720,7 @@ pre prealloc preload prepended +prepending presize primary's printf @@ -744,6 +755,7 @@ recno recnos recsize recurse +refp reinitialization req rescan |