Merge version-3.8.7 changes with this branch.

FossilOrigin-Name: d380a6482a46478ebdf97e08b2fcf78b5d126dde

diff --cc manifest
index 373d1c020aab2b61ee9ebe2a7021826c8b4077e9,894c7cd51af6742dc70ce35d66ba2b981bc3a901..b1900479f64d8f074ee537cb6e4399be4df9eab7
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Have\sthe\sota\sextension\sperform\san\sincremental\scheckpoint\safter\sgenerating\sthe\swal\sfile.
- D 2014-10-20T16:24:23.616
 -C Fix\sa\s(probably\sharmless)\sbut\sin\sthe\sCSV\soutput\smode\sof\sthe\scommand-line\nshell.
 -D 2014-10-17T21:35:05.954
++C Merge\sversion-3.8.7\schanges\swith\sthis\sbranch.
++D 2014-10-20T16:34:03.980
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -180,33 -172,33 +181,33 @@@ F src/auth.c d8abcde53426275dab6243b441
  F src/backup.c a31809c65623cc41849b94d368917f8bb66e6a7e
  F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb
  F src/btmutex.c 49ca66250c7dfa844a4d4cb8272b87420d27d3a5
- F src/btree.c be6c5e117062678a92b4aa89ca36722727b8f034
 -F src/btree.c 1b1123cba0c65caa0baa51e71b8c089e3167c3ed
++F src/btree.c c6022918315eab880df0176a0d5690aa4bf32e14
  F src/btree.h a79aa6a71e7f1055f01052b7f821bd1c2dce95c8
- F src/btreeInt.h e0ecb5dba292722039a7540beb3fc448103273cc
- F src/build.c 047d7e1d2d89fa55134fa1d6b669c9c2983c0d11
+ F src/btreeInt.h 026d0129724e8f265fdc60d44ec240cf5a4e6179
+ F src/build.c 9dc2bd94347b878c89627000c92b0c8d97ec2919
  F src/callback.c 7b44ce59674338ad48b0e84e7b72f935ea4f68b0
  F src/complete.c 535183afb3c75628b78ce82612931ac7cdf26f14
- F src/ctime.c 16cd19215d9fd849ee2b7509b092f2e0bbd6a958
+ F src/ctime.c bb434068b5308a857b181c2d204a320ff0d6c638
  F src/date.c 57a7f9ba9f6b4d5268f5e411739066a611f99036
 -F src/delete.c fae81cc2eb14b75267d4f47d3cfc9ae02aae726f
 +F src/delete.c df9e2f273675ebf8d7f229e7668ba941bdc7021a
- F src/expr.c 19392d98e089640c3336e65b4254cc337efef7d1
+ F src/expr.c fc204d08af06437ddaffe5a1b1f1f6f9e1a55d6d
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c da985ae673efef2c712caef825a5d2edb087ead7
- F src/func.c 1629ccdd8ef3f19d7accc9d9287190489469ff81
- F src/global.c 5110fa12e09729b84eee0191c984ec4008e21937
+ F src/func.c ba47c1671ab3cfdafa6e9d6ee490939ea578adee
+ F src/global.c 01c1f36ecfcf10770db648422a8852c222308bb9
  F src/hash.c 4263fbc955f26c2e8cdc0cf214bc42435aa4e4f5
  F src/hash.h c8f3c31722cf3277d03713909761e152a5b81094
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
- F src/insert.c 887551441b3a46d964733b16a86c614d0152778d
 -F src/insert.c 5b9243a33726008cc4132897d2be371db12a13be
++F src/insert.c fef86ab8218cf0d926db93280b9eb5b583981353
  F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
  F src/legacy.c ba1863ea58c4c840335a84ec276fc2b25e22bc4e
  F src/lempar.c 7274c97d24bb46631e504332ccd3bd1b37841770
  F src/loadext.c de741e66e5ddc1598d904d7289239696e40ed994
- F src/main.c 57cdf37a1bf596829831530fe02f2649d4b721e3
- F src/malloc.c 4c1d511157defd7b1d023062cf05a1dc17b8f79b
 -F src/main.c bbe872b0ac0007bed0ebe1936fc493b039ad4f51
++F src/main.c d7a31f8c19c27b046cef381369381bba379c3730
+ F src/malloc.c 3c3ac67969612493d435e14b6832793209afd2ec
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c faf615aafd8be74a71494dfa027c113ea5c6615f
- F src/mem2.c dce31758da87ec2cfa52ba4c5df1aed6e07d8e8f
+ F src/mem2.c f1940d9e91948dd6a908fbb9ce3835c36b5d83c3
  F src/mem3.c 61c9d47b792908c532ca3a62b999cf21795c6534
  F src/mem5.c 61eeb90134f9a5be6c2e68d8daae7628b25953fb
  F src/memjournal.c 3eb2c0b51adbd869cb6a44780323f05fa904dc85
@@@ -220,32 -212,32 +221,32 @@@ F src/os.c 1b147e4cf7cc39e618115c14a086
  F src/os.h 3e57a24e2794a94d3cf2342c6d9a884888cd96bf
  F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
  F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
- F src/os_unix.c addd023b26c623fec4dedc110fc4370a65b4768c
- F src/os_win.c 0a4042ef35f322e86fa01f6c8884c5e645b911e7
+ F src/os_unix.c fb587121840f690101336879adfa6d0b2cd0e8c7
+ F src/os_win.c a019caaae2bcbbc0cc4c39af6e7d7e43d8426053
  F src/os_win.h 09e751b20bbc107ffbd46e13555dc73576d88e21
- F src/pager.c 59c1d41bba7dd736f27fdcf74691675aa685a048
 -F src/pager.c a171cf9dd09c6cb162b262c328d4dfd198e04f80
 -F src/pager.h ffd5607f7b3e4590b415b007a4382f693334d428
++F src/pager.c 93ad94d62e959c2a4d85de17a5636da174e55533
 +F src/pager.h 997a4aa3bad1638dabe90a0cbb674cc4a7b9c034
- F src/parse.y 22d6a074e5f5a7258947a1dc55a9bf946b765dd0
+ F src/parse.y 5dfead8aed90cb0c7c1115898ee2266804daff45
  F src/pcache.c 4121a0571c18581ee9f82f086d5e2030051ebd6a
  F src/pcache.h 9b559127b83f84ff76d735c8262f04853be0c59a
- F src/pcache1.c dab8ab930d4a73b99768d881185994f34b80ecaa
+ F src/pcache1.c e412cb585f777c840ddce0500eddc5c6043c2bb5
 -F src/pragma.c 3f3e959390a10c0131676f0e307acce372777e0f
 +F src/pragma.c 310939bc2fb7e6456edfb4735d004253a4b2505e
  F src/prepare.c 6ef0cf2f9274982988ed6b7cab1be23147e94196
- F src/printf.c 19e3e81addf593195369ec8d487ed063ad3170bb
+ F src/printf.c 6b79bbd063dcbadca4cf617a4cde255bcc13ea64
  F src/random.c d10c1f85b6709ca97278428fd5db5bbb9c74eece
  F src/resolve.c a3466128b52a86c466e47ac1a19e2174f7b5cf89
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
- F src/select.c 0cd6706fd52ae5db229e9041094db6ec27195335
- F src/shell.c c00220cdd7f2027780bc25b78376c16dc24e4b7d
- F src/sqlite.h.in f34298ae5de26aebfba0c5ce91590d62ddebc6cb
+ F src/select.c 428165951748151e87a15295b7357221433e311b
+ F src/shell.c 282f8f5278e0c78eb442217531172ec9e1538796
 -F src/sqlite.h.in 4a5e5158c189d2bcd45c7c4607c2c0eb6d25c153
++F src/sqlite.h.in 5c89ff33315006449119b86b460e0a286758f126
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
  F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d
- F src/sqliteInt.h 3210f8bd040d1c6d8b1616325b15dd3ff749e48f
 -F src/sqliteInt.h f7812f74f2d0c6041ef6b91a99c5a45f775dd408
++F src/sqliteInt.h cf72fe02b33f46572c681cc90ad64a5851f10b8f
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
- F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158
+ F src/status.c 961d5926e5a8fda611d385ec22c226b8635cd1cb
  F src/table.c 2e99ef7ef16187e17033d9398dc962ce22dab5cb
 -F src/tclsqlite.c c67d310c833046cccc192125d64ad422ab882684
 -F src/test1.c 518db4305d76b29dd9da3f022ca899c8fcdf9fc7
 +F src/tclsqlite.c ac7d1672f69c9d69defeb022f656d04f5cefd198
- F src/test1.c 44562bf344a6b12a273f46fd906631ef301a6416
++F src/test1.c 4b4659bb248c0bef8ef6cd85141f09f6c2a55e71
  F src/test2.c 98049e51a17dc62606a99a9eb95ee477f9996712
  F src/test3.c 1c0e5d6f080b8e33c1ce8b3078e7013fdbcd560c
  F src/test4.c 9b32d22f5f150abe23c1830e2057c4037c45b3df
@@@ -290,27 -282,27 +291,27 @@@ F src/test_thread.c 1e133a40b50e9c035b0
  F src/test_vfs.c f84075a388527892ff184988f43b69ce69b8083c
  F src/test_vfstrace.c bab9594adc976cbe696ff3970728830b4c5ed698
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
- F src/threads.c 22dded4283dc4b25422f6444cdcb8d6b1ea0b5ff
- F src/tokenize.c 3df63041994f55afeb168b463ec836e8f1c50e7c
+ F src/threads.c 6de09362b657f19ba83e5fa521ee715787ce9fee
+ F src/tokenize.c cc9016e5007fc5e76789079616d2f26741bcc689
 -F src/trigger.c 25571661fdeae8c7f975ff40ffec205520a3f92f
 +F src/trigger.c eb921d1292aca83d515bde5881df71df91d962d6
  F src/update.c 729f6f18fc27740591d085e1172cebe311144bf0
- F src/utf.c 8f634b93d41c089029dd503161a7d3e685d59a9c
+ F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
  F src/util.c 4006c01772bd8d8ac4306d523bbcee41d3e392d8
  F src/vacuum.c 59f03f92bcff57faa6a8ca256eb29ccddfb0614a
- F src/vdbe.c 78606777e4ce5dba147ab75e71c0127b0d8d4c3d
+ F src/vdbe.c 5ee15a66ce07e0482b92aa29e4dd0c5827a22d79
  F src/vdbe.h 09f5b4e3719fa454f252322b1cdab5cf1f361327
- F src/vdbeInt.h f90b0de6153f50de630a5a113537efb47083812f
- F src/vdbeapi.c c02242df5e9e8d1001e0086f405953833f9c426b
- F src/vdbeaux.c 9ac63bc59d2783df77e591e4c4fa8c1153a07eab
+ F src/vdbeInt.h e2a060a55ee18a6ab973353a5e2ec7ee569bf787
+ F src/vdbeapi.c 37a6c6ae284a97bcace365f2f0a225680c0499d9
+ F src/vdbeaux.c edbb7a9c8b2a8f7a68ac75c2475edd4040266b76
 -F src/vdbeblob.c 848238dc73e93e48432991bb5651bf87d865eca4
 +F src/vdbeblob.c a8e2c3baa3e7081347c4677185a631bfc43de043
- F src/vdbemem.c 8b5e1083fed2da94e315858a7edf5604a5b91804
- F src/vdbesort.c 09efa5e5098d1a159cd21f588eb118e4fe87cfde
- F src/vdbetrace.c 16d39c1ef7d1f4a3a7464bea3b7b4bdd7849c415
- F src/vtab.c 019dbfd0406a7447c990e1f7bd1dfcdb8895697f
+ F src/vdbemem.c 31d8eabb0cd78bfeab4e5124c7363c3e9e54db9f
+ F src/vdbesort.c 975aeffa99acb0991b2f288d30294756bff41438
+ F src/vdbetrace.c 7e4222955e07dd707a2f360c0eb73452be1cb010
+ F src/vtab.c cb0c194303fea276b48d7d4b6d970b5a96bde8de
 -F src/wal.c 10e7de7ce90865a68153f001a61f1d985cd17983
 -F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
 +F src/wal.c a5dbbbd8ceccd5e2187b1e7854f359cb5efb7e3b
 +F src/wal.h 0d3ba0c3f1b4c25796cb213568a84b9f9063f465
  F src/walker.c c253b95b4ee44b21c406e2a1052636c31ea27804
- F src/where.c dc276288039fb45ce23c80e4535980f5a152d8ec
+ F src/where.c 2947912f1f3d6a7766fe087fd532a5d688d745b1
  F src/whereInt.h 124d970450955a6982e174b07c320ae6d62a595c
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
@@@ -756,7 -751,7 +760,8 @@@ F test/orderby5.test 8f08a54836d21fb7c7
  F test/orderby6.test 8b38138ab0972588240b3fca0985d2e400432859
  F test/orderby7.test 3d1383d52ade5b9eb3a173b3147fdd296f0202da
  F test/oserror.test 50417780d0e0d7cd23cf12a8277bb44024765df3
 +F test/ota.test d81a211dfbdf9fe02b5ad50c86f8a5df924391f5
+ F test/ovfl.test 4f7ca651cba5c059a12d8c67dddd49bec5747799
  F test/pager1.test 1acbdb14c5952a72dd43129cabdbf69aaa3ed1fa
  F test/pager2.test 67b8f40ae98112bcdba1f2b2d03ea83266418c71
  F test/pager3.test 3856d9c80839be0668efee1b74811b1b7f7fc95f
@@@ -1208,7 -1204,7 +1214,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 95ffdaa542df1c28fac97422e5a4b2c5cb81d50a
- R febab191432990759e75444c2ec5fc2f
 -P e4ab094f8afce0817f4074e823fabe59fc29ebb4
 -R bacb142e035c538b5014a902fee951f4
 -U drh
 -Z 99accb7d1ae416e10fed302750dd8f99
++P 0bf1301aacb3b717b4cc020fbda9fab0bae331c3 19fe4a0a475bd94f491031aea7a183f7c0515cf3
++R 348e09d90bfec6d435f7913d476a2e51
 +U dan
- Z 5341e3998131d826ad56eb5ef99fe7b1
++Z d6c8c1f51d897af1aed5284afd8b6a66

diff --cc manifest.uuid
index 420e80d994b92eee1a2106bfdcf9d1666c8cc883,db419ccbecce9a37ef6a8f7c079b7eb950ff16f5..0ed1c9bb69bba5d425647e19dcb68775ad4d5cc6
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 0bf1301aacb3b717b4cc020fbda9fab0bae331c3
 -19fe4a0a475bd94f491031aea7a183f7c0515cf3
++d380a6482a46478ebdf97e08b2fcf78b5d126dde

diff --cc src/btree.c
Simple merge

diff --cc src/insert.c
Simple merge

diff --cc src/main.c
Simple merge

diff --cc src/pager.c
Simple merge

diff --cc src/sqlite.h.in
Simple merge

diff --cc src/sqliteInt.h
index 7633bbb2473aa211487bf6e7a07c6fa851b0f5fc,cba89b03e77332bc60bd6999485b8a1454354001..2863c1bd104070ab5399bd3d568011e8bad8edc5
--- 1/src/sqliteInt.h
--- 2/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@@ -3771,12 -3799,10 +3801,11 @@@ SQLITE_EXTERN void (*sqlite3IoTrace)(co
  # define sqlite3MemdebugNoType(X,Y)   1
  #endif
  #define MEMTYPE_HEAP       0x01  /* General heap allocations */
- #define MEMTYPE_LOOKASIDE  0x02  /* Might have been lookaside memory */
+ #define MEMTYPE_LOOKASIDE  0x02  /* Heap that might have been lookaside */
  #define MEMTYPE_SCRATCH    0x04  /* Scratch allocations */
  #define MEMTYPE_PCACHE     0x08  /* Page cache allocations */
- #define MEMTYPE_DB         0x10  /* Uses sqlite3DbMalloc, not sqlite_malloc */
  
 +
  /*
  ** Threading interface
  */

diff --cc src/test1.c
Simple merge