Merge enhancements from trunk.

FossilOrigin-Name: a533608cb0de3cbc1e28a794aab99864b8c249f4

diff --cc manifest
index d3554573d4c012b3843a222ee6ef9a0e54992eba,8c2dfea1b7a8f7e36f2fcd8ec0e702c1e9c067ab..8ad6e5d2fcf925508cba52e73b0b66793a69e3f9
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,8 -1,8 +1,8 @@@
- C Merge\sall\srecent\senhancements\sfrom\strunk.
- D 2016-02-02T02:22:30.647
 -C Improvements\sto\sthe\sway\sout-of-memory\sconditions\sare\shandled,\sresulting\nin\san\salmost\s1%\sperformance\sgain\sin\sthe\scommmon\scase\swhere\sOOM\serrors\sdo\nnot\soccur.
 -D 2016-02-05T14:11:12.413
 -F Makefile.in 027c1603f255390c43a426671055a31c0a65fdb4
++C Merge\senhancements\sfrom\strunk.
++D 2016-02-05T14:15:34.907
 +F Makefile.in b12720a3957eb741a77a41d3412745b80ac3fa5d
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 -F Makefile.msc 72b7858f02017611c3ac1ddc965251017fed0845
 +F Makefile.msc c6dfe4708e38482130e3ccc374be6d5ca4aeb26e
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION 866588d1edf0ccb5b0d33896974338f97564f719
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -310,30 -291,30 +311,30 @@@ F src/auth.c b56c78ebe40a2110fd361379f7
  F src/backup.c 2869a76c03eb393ee795416e2387005553df72bc
  F src/bitvec.c 1a78d450a17c5016710eec900bedfc5729bf9bdf
  F src/btmutex.c bc87dd3b062cc26edfe79918de2200ccb8d41e73
- F src/btree.c a2a0244ea3f0b3f57f75019c2f229c744ca5d202
+ F src/btree.c 0b359bcc2316a57acf12f583253974ad22b4654f
  F src/btree.h 368ceeb4bd9312dc8df2ffd64b4b7dbcf4db5f8e
  F src/btreeInt.h c18b7d2a3494695133e4e60ee36061d37f45d9a5
- F src/build.c 33dea2cef04c16a902c55f9d83b1a2065f213979
- F src/callback.c 29ae4faba226c7ebb9aee93016b5ce8a8f071261
+ F src/build.c 198eaa849c193f28b802ed135b2483c68ef7a35c
+ F src/callback.c ed6c2a4a712eb7287ff64e20e3c23265dfb8a7ce
  F src/complete.c addcd8160b081131005d5bc2d34adf20c1c5c92f
  F src/ctime.c 60e135af364d777a9ab41c97e5e89cd224da6198
- F src/date.c 997651e3ee6c2818fbf7fcdb7156cef9eb3ece20
+ F src/date.c ca17321bc17cca8f40e0843edea4fafff974998e
  F src/dbstat.c b2ec6793eef97aebb4d171d490a4ffdfa9f2475c
- F src/delete.c b6d96db8c7e01ddf1448381c9afd26c7eb4d20d3
- F src/expr.c d10c1cdef5810cdbf73adc9f9b383684230b360a
 -F src/delete.c 48802aa3ee6339f576d074336d3ae1b5f40e240f
++F src/delete.c eeac28b3d3d88e3541bdf93e91ea7492a7b67842
+ F src/expr.c fbf0706199aea23c54efe36b6932d8307c4eb872
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
- F src/fkey.c c66d3e5b35d4d95b5c1e2ee6c12f5df13a7f9ad6
- F src/func.c 42b24923328f65849f52f1659efb2a0907ad78fd
+ F src/fkey.c 08edad1fce30f761f14b3997e89bad58f9f7f4e0
+ F src/func.c 86e55fee35b9577e485f47d9dd5c1d34cd513288
  F src/global.c bd5a0af3f30b0c01be6db756c626cd3c33a3d260
  F src/hash.c 4263fbc955f26c2e8cdc0cf214bc42435aa4e4f5
  F src/hash.h c8f3c31722cf3277d03713909761e152a5b81094
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
- F src/insert.c ca97b03d6eccbe9eb79c4091722660625fb55495
 -F src/insert.c b84359365bace233919db550a15f131923190efc
++F src/insert.c 0c96c4f1caa18948484f8f2e229d7af9b8b4e25f
  F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
- F src/legacy.c ba1863ea58c4c840335a84ec276fc2b25e22bc4e
+ F src/legacy.c b1b0880fc474abfab89e737b0ecfde0bd7a60902
  F src/loadext.c 84996d7d70a605597d79c1f1d7b2012a5fd34f2b
- F src/main.c c7d4a1858446db5f611891ddce62572b1fdec040
- F src/malloc.c b67c26c359c13836d370350b3f43d228dff5b360
 -F src/main.c 62b7fe3ed245757d1ff2e6268a7ec0bc30100308
++F src/main.c 988a73bf14251ab9c4e1ad8743aa651bd713bea2
+ F src/malloc.c 55ebb1701ebd39985dbcc497aaecb09192b69682
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c 6919bcf12f221868ea066eec27e579fed95ce98b
  F src/mem2.c f1940d9e91948dd6a908fbb9ce3835c36b5d83c3
@@@ -360,19 -341,19 +361,19 @@@ F src/parse.y d7bff41d460f2df96fb890f36
  F src/pcache.c 73895411fa6b7bd6f0091212feabbe833b358d23
  F src/pcache.h 4d0ccaad264d360981ec5e6a2b596d6e85242545
  F src/pcache1.c 72f644dc9e1468c72922eff5904048427b817051
- F src/pragma.c 2ac26ac45eedbed3cc8a9a320ad6d2fc299e69a6
+ F src/pragma.c 80ee77226d0008d9188356a6cbbe6010866e1bee
  F src/pragma.h 64c78a648751b9f4f297276c4eb7507b14b4628c
- F src/prepare.c db85f0451ba93ecb3c1e497c279abece5cb5aead
- F src/printf.c 98a5cef7fc84577ab8a3098cfa48ecfa5a70b9f8
+ F src/prepare.c c12b786713df3e8270c0f85f988c5359d8b4d87c
+ F src/printf.c 63e6fb12bbe702dd664dc3703776c090383a5a26
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
  F src/resolve.c 9f7ce3a3c087afb7597b7c916c99126ff3f12f0c
- F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
- F src/select.c ea6f3b0c279aa37eb3701792d094673a7ad1bf88
+ F src/rowset.c 9fe4b3ad7cc00944386bb600233d8f523de07a6e
+ F src/select.c 57646a44ba9a0bc4aa926ae9c79b8199c246844b
 -F src/shell.c dcd7a83645ef2a58ee9c6d0ea4714d877d7835c4
 -F src/sqlite.h.in cf22ad1d52dca2c9862d63833e581028119aab7e
 +F src/shell.c 01e109c27300379b1c35b254cd294cde635f0179
 +F src/sqlite.h.in 301c01f7c514cbb9ff5110889ea24e1a9715edac
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h dfbe62ffd95b99afe2140d8c35b180d11924072d
- F src/sqliteInt.h c44a27bbb24b842e69812f115b74a90909b90f29
 -F src/sqliteInt.h 3aeaff9611acd790c8e76719b33db09ab885d537
++F src/sqliteInt.h f58219ec2bae2458f2ead1c6e187646a3c70594a
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c 70912d7be68e9e2dbc4010c93d344af61d4c59ba
  F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e
@@@ -425,23 -406,23 +426,23 @@@ F src/test_windirent.c 8f5fada630348558
  F src/test_windirent.h b12055cab6227f7be10f5c19296f67c60cc5e2a5
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
  F src/threads.c bbfb74450643cb5372a43ad4f6cffd7e9dfcecb0
- F src/tokenize.c 5606871a377f390af7040ec3c12e0d183512d785
+ F src/tokenize.c 214b783d6138e9f9fbb6b225ce9a376db3b03d42
  F src/treeview.c dc39ccf04e9331237388b9cb73289c9d87ea050b
- F src/trigger.c 72d876b2d0c66604a112362bdae07dae9b104816
- F src/update.c d8d675aa299336ac086ad2039d7e812cd6237db0
+ F src/trigger.c e14840ee0c3e549e758ec9bf3e4146e166002280
 -F src/update.c 310ca7adb86a7d1f2afae46905b21c83580f3e17
++F src/update.c 52552d2fe1bb66e7bdaedbd68e7dda1f5705bd44
  F src/utf.c 10cc2519e82e3369344d0969ad4b1a333dc86d18
- F src/util.c 72d40df0a52d3f30b462a15f0e094fcbade6dc82
+ F src/util.c 49ce0a65306c1c51d61cb5bc214c71cb62452de6
  F src/vacuum.c 2ddd5cad2a7b9cef7f9e431b8c7771634c6b1701
- F src/vdbe.c c5244f9750e778a0c5501d6cffa3bfda508f2f2a
 -F src/vdbe.c c193299e595a13eba247738e22fce25c49346a6c
 -F src/vdbe.h 7a733ea8aac1b77305a67698e784fa3484ee3337
 -F src/vdbeInt.h 4b69d5451bcadd473e745af53ef1e8abfdce0a79
 -F src/vdbeapi.c 9324f6baee1a1b2284c6543e98f916888a81e459
 -F src/vdbeaux.c 49b536284c2b8a823dd342d653e18145ca2b393a
 -F src/vdbeblob.c 3b570b730109e8f653d9d2081649f6e7015113db
 -F src/vdbemem.c 68fcfac37dc6601d98c32cc5adee4d39f2c1b7b4
++F src/vdbe.c 830c927c64e477f86f33d806c585ab1904cf6e4e
 +F src/vdbe.h 19162d5d75d00ee9e634ad630f2a873e1cf76359
 +F src/vdbeInt.h 2a8796b099a463cf6c32514f8aa138d3b0c36b23
- F src/vdbeapi.c 648ebb95c1a60ced4f0e23ecfb12b43d6aca55ec
- F src/vdbeaux.c e41d494842aaa8b6d47d9d40bb58b1aa4bb3ddaa
- F src/vdbeblob.c 6ccda01a78b3f9d9a0c75f79e7a1150f3fb0cb39
- F src/vdbemem.c 6c962ee0a77de009dafb6d7f3c7e8bf7b82c47f8
++F src/vdbeapi.c f9bed48c23da6487fbe6648df45f340ccc199c4f
++F src/vdbeaux.c 456d0673ddced03335c8657af28eff4d13e54794
++F src/vdbeblob.c c9f2f494b911c6fa34efd9803f0a10807da80f77
++F src/vdbemem.c 36e2779132eaff83c7ed44d76340b8d2caab17cf
  F src/vdbesort.c ef3c6d1f1a7d44cf67bb2bee59ea3d1fe5bad174
  F src/vdbetrace.c f75c5455d8cf389ef86a8bfdfd3177e0e3692484
- F src/vtab.c 320682cca733115b4cbe71320b5c5eeb1074ebde
+ F src/vtab.c bef51b4f693d82b4b0184457faa8625654534091
  F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
  F src/wal.c d21b99fd1458159d0b1ecdccc8ee6ada4fdc4c54
  F src/wal.h 2f7c831cf3b071fa548bf2d5cac640846a7ff19c
@@@ -961,8 -944,8 +964,8 @@@ F test/parser1.test 222b5cbf3e2e659fec1
  F test/pcache.test c8acbedd3b6fd0f9a7ca887a83b11d24a007972b
  F test/pcache2.test af7f3deb1a819f77a6d0d81534e97d1cf62cd442
  F test/percentile.test 4243af26b8f3f4555abe166f723715a1f74c77ff
- F test/permutations.test 63cb93f915b4056463cef8ad035082e9f1cb524e
- F test/pragma.test a44253f911e7d50127d4a08f927f47c861a4c772
 -F test/permutations.test 382a43c49f49bafe6fddffe904ea33d6bb3ff33e
++F test/permutations.test 74a48d89ce0d9ca8ad45a8f9f4bf66fa8bee0e34
+ F test/pragma.test 507ac7ef2ea5682241ea0ef041799ca70bb5e0bf
  F test/pragma2.test a9400a7289605280576098b97f5cde3f204075c0
  F test/pragma3.test 6f849ccffeee7e496d2f2b5e74152306c0b8757c
  F test/printf.test b3ff34e73d59124140eaf89f7672e21bc2ca5fcc
@@@ -998,6 -980,7 +1000,7 @@@ F test/savepoint4.test c8f8159ade6d2acd
  F test/savepoint5.test 0735db177e0ebbaedc39812c8d065075d563c4fd
  F test/savepoint6.test f41279c5e137139fa5c21485773332c7adb98cd7
  F test/savepoint7.test db3db281486c925095f305aad09fe806e5188ff3
 -F test/savepointfault.test f044eac64b59f09746c7020ee261734de82bf9b2
++F test/savepointfault.test f044eac64b59f09746c7020ee261734de82bf9b2 w test/savepoint3.test
  F test/scanstatus.test 5253c219e331318a437f436268e0e82345700285
  F test/schema.test 8f7999be894260f151adf15c2c7540f1c6d6a481
  F test/schema2.test 906408621ea881fdb496d878b1822572a34e32c5
@@@ -1096,7 -1078,7 +1099,7 @@@ F test/tclsqlite.test 7179b4e0bf236ddf0
  F test/tempdb.test 19d0f66e2e3eeffd68661a11c83ba5e6ace9128c
  F test/temptable.test d2c9b87a54147161bcd1822e30c1d1cd891e5b30
  F test/temptrigger.test 8ec228b0db5d7ebc4ee9b458fc28cb9e7873f5e1
- F test/tester.tcl a4b1c8e78ad88426dc0b2375e0b5348d2b841c88
 -F test/tester.tcl 462376b478c1429030911b4cb7c8c517ef1fbd9b
++F test/tester.tcl d8ef0a5ab95b16fefd7123f38647114c34b0c9b7
  F test/thread001.test 9f22fd3525a307ff42a326b6bc7b0465be1745a5
  F test/thread002.test e630504f8a06c00bf8bbe68528774dd96aeb2e58
  F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7
@@@ -1363,6 -1345,7 +1366,7 @@@ F test/whereH.test e4b07f7a3c2f5d31195c
  F test/whereI.test 1d89199697919d4930be05a71e7fe620f114e622
  F test/whereJ.test 55a3221706a7ab706293f17cc8f96da563bf0767
  F test/whereK.test f8e3cf26a8513ecc7f514f54df9f0572c046c42b
 -F test/wherefault.test 1374c3aa198388925246475f84ad4cd5f9528864
++F test/wherefault.test 1374c3aa198388925246475f84ad4cd5f9528864 w test/where8m.test
  F test/wherelimit.test 5e9fd41e79bb2b2d588ed999d641d9c965619b31
  F test/wild001.test bca33f499866f04c24510d74baf1e578d4e44b1c
  F test/win32heap.test ea19770974795cff26e11575e12d422dbd16893c
@@@ -1443,7 -1426,8 +1447,7 @@@ F tool/vdbe_profile.tcl 246d0da094856d7
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 36cb3d6e274a06a78693ca506feaad0b14bde11d d8b7b1996eefae7768bfcb82d4ff22c69392aa63
- R a6848fc70bf84dd1da28684cee4a5e04
 -P fe123ab4f17f97ba9d64a7e0589ac47fd9d43877 0a802e96ab06e2643834b83671fa8353da1a348d
 -R 3749c59fe6fdfc59db76e85b115f2d1f
 -T +closed 0a802e96ab06e2643834b83671fa8353da1a348d
++P f3f9200115caf4b356f90ec97c351d1afbcb9bf6 b082538da774ac77f284fd7e22f9b1b9c2abc343
++R caf89ffed359feebe1a7893788b9d4fd
  U drh
- Z 8c0e589f1ff041b7f5f063df66382fc8
 -Z 89e3d20f1d49685c430d339bf1d58063
++Z 50b2b3cb434b1b40a7be12f42687aabd

diff --cc manifest.uuid
index 1979b8ac777b0f305ff8703afc829f082c9ce473,96f1ef1f1f444e27b74fcc9cf831b1040d98ad69..70420107af48a5f39f04c30cb0eaca58ce4c68e3
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- f3f9200115caf4b356f90ec97c351d1afbcb9bf6
 -b082538da774ac77f284fd7e22f9b1b9c2abc343
++a533608cb0de3cbc1e28a794aab99864b8c249f4

diff --cc src/delete.c
Simple merge

diff --cc src/insert.c
Simple merge

diff --cc src/main.c
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/update.c
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc src/vdbeapi.c
Simple merge

diff --cc src/vdbeaux.c
Simple merge

diff --cc src/vdbeblob.c
Simple merge

diff --cc src/vdbemem.c
Simple merge

diff --cc test/permutations.test
Simple merge

diff --cc test/tester.tcl
Simple merge