Merge recent trunk enhancements.

FossilOrigin-Name: ccb601f6dffba68a57d82db2d046aa27f6f1b755

diff --cc Makefile.in
Simple merge

diff --cc main.mk
Simple merge

diff --cc manifest
index 1e7efa2a878601f6585c9633d1ce60f91ffade44,8a5349a2dde39e9185914f51df77471625b9b0b3..6dab2c4295ab6266ccaa41b11e8dd3405c0d862c
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Merge\sall\srecent\strunk\senhancements\sinto\sthe\sapple-osx\sbranch.
- D 2014-10-31T15:20:47.003
 -C Merge\sin\sall\sthe\sother\sROLLBACK\sfixes\sfrom\sthe\sbranch-3.8.7\sbranch.\s\s\nI\sdon't\sknow\swhy\sI\swas\sdoing\sthem\sone-by-one.
 -D 2014-11-18T20:49:30.759
++C Merge\srecent\strunk\senhancements.
++D 2014-11-18T21:27:48.468
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in bf041d20aeed250922fb1ba4bd13d34d3fa470e9
 -F Makefile.in a226317fdf3f4c895fb3cfedc355b4d0868ce1fb
++F Makefile.in 73a6c2ce505d58bbb21bb703402fbe61fb8b4fd5
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc e31dee24038965fb6269d6d61073fd6b7e331dec
+ F Makefile.msc 788f1288633a0c3c3cbbe0f3e4827d033f7ba530
  F Makefile.vxworks 034289efa9d591b04b1a73598623119c306cbba0
  F README.md 64f270c43c38c46de749e419c22f0ae2f4499fe8
  F VERSION d846487aff892625eb8e75960234e7285f0462fe
@@@ -154,7 -152,7 +155,7 @@@ F ext/userauth/userauth.c 5fa3bdb492f48
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk 68ddbbceb1602d89d7132184bc25f9180a99eaba
 -F main.mk 084976077a4aa3bd985154b5423e7aed88e4a2e9
++F main.mk 38606b15b2fcbf2ed6222decebda345270d75dc9
  F mkopcodec.awk c2ff431854d702cdd2d779c9c0d1f58fa16fa4ea
  F mkopcodeh.awk c6b3fa301db6ef7ac916b14c60868aeaec1337b5
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
@@@ -172,33 -170,33 +173,33 @@@ F src/alter.c ba266a779bc7ce10e52e59e7d
  F src/analyze.c afbcca663c3f3625340b8e30d440cd7a97ded6bc
  F src/attach.c f4e94df2d1826feda65eb0939f7f6f5f923a0ad9
  F src/auth.c b56c78ebe40a2110fd361379f7e8162d23f92240
- F src/backup.c 7f841396adfd47507ff670a471162d2bfcda3136
+ F src/backup.c 7ddee9c7d505e07e959a575b18498f17c71e53ea
  F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb
  F src/btmutex.c 49ca66250c7dfa844a4d4cb8272b87420d27d3a5
- F src/btree.c eeebb8175df346b720bc68f7fbb528d5fcfdccfd
- F src/btree.h a79aa6a71e7f1055f01052b7f821bd1c2dce95c8
- F src/btreeInt.h 026d0129724e8f265fdc60d44ec240cf5a4e6179
 -F src/btree.c b562da29eb370aaac8015026827c2e2fb70ae990
++F src/btree.c 6d877cd224c8a600b34519b219980184e83e0a03
+ F src/btree.h e31a3a3ebdedb1caf9bda3ad5dbab3db9b780f6e
+ F src/btreeInt.h 3363e18fd76f69a27a870b25221b2345b3fd4d21
  F src/build.c 67bb05b1077e0cdaccb2e36bfcbe7a5df9ed31e8
  F src/callback.c 7b44ce59674338ad48b0e84e7b72f935ea4f68b0
  F src/complete.c c4ba6e0626bb94bc77a0861735f3382fcf7cc818
  F src/ctime.c df19848891c8a553c80e6f5a035e768280952d1a
- F src/date.c 57a7f9ba9f6b4d5268f5e411739066a611f99036
+ F src/date.c 93594514aae68de117ca4a2a0d6cc63eddf26744
  F src/delete.c 0750b1eb4d96cd3fb2c798599a3a7c85e92f1417
- F src/expr.c 0391a657df4959eaf2a2fd7d77de5ebe750686ee
+ F src/expr.c a3ff05db5709d628c23890db862e30f3dd9dc428
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c da985ae673efef2c712caef825a5d2edb087ead7
 -F src/func.c ba47c1671ab3cfdafa6e9d6ee490939ea578adee
 +F src/func.c 93a4b3c54019d6dbbe49800822d802df70553980
- F src/global.c 01c1f36ecfcf10770db648422a8852c222308bb9
+ F src/global.c 6ded36dda9466fc1c9a3c5492ded81d79bf3977d
  F src/hash.c 4263fbc955f26c2e8cdc0cf214bc42435aa4e4f5
  F src/hash.h c8f3c31722cf3277d03713909761e152a5b81094
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
  F src/insert.c 5b9243a33726008cc4132897d2be371db12a13be
  F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
 -F src/legacy.c ba1863ea58c4c840335a84ec276fc2b25e22bc4e
 +F src/legacy.c 9c17d86e06522c261307f0eb6bcb1254c8b04a59
  F src/lempar.c 7274c97d24bb46631e504332ccd3bd1b37841770
  F src/loadext.c de741e66e5ddc1598d904d7289239696e40ed994
- F src/main.c 0e55414274994377ecf2c28a4196b4fe7813d7d0
- F src/malloc.c 3c3ac67969612493d435e14b6832793209afd2ec
 -F src/main.c d3310d5ed56e246bf1589e47eeaca8be582bd4b8
++F src/main.c e260eb4acd192a3958b5d529507e447cab031cbc
+ F src/malloc.c 740db54387204c9a2eb67c6d98e68b08e9ef4eab
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c faf615aafd8be74a71494dfa027c113ea5c6615f
  F src/mem2.c f1940d9e91948dd6a908fbb9ce3835c36b5d83c3
@@@ -215,33 -213,32 +216,33 @@@ F src/os.c 5822c2b843a77219bba1e28887cd
  F src/os.h 3e57a24e2794a94d3cf2342c6d9a884888cd96bf
  F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
  F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
 -F src/os_unix.c fb587121840f690101336879adfa6d0b2cd0e8c7
 -F src/os_win.c a9e500dd963fb1f67d7860e58b5772abe6123862
 +F src/os_unix.c 2af3813fd2df6f5d016d1dfef541d2c9e98fd600
- F src/os_win.c 752a65dc7e6f28379052776dca52ebeaeaffb12f
++F src/os_win.c 1a38ad1288b4b263c85d124093b8a6f59702925b
  F src/os_win.h 09e751b20bbc107ffbd46e13555dc73576d88e21
 -F src/pager.c 8d97b3633f098fef817656dcbf167ca904511d78
 -F src/pager.h d1eee3c3f741be247ce6d82752a178515fc8578b
 +F src/pager.c b7c7af7c5b6ee6f36d7fca825346a317c1ea0a55
 +F src/pager.h 78ba46ce1f98b9a9791f4b39e52aedd6ed988472
  F src/parse.y 5dfead8aed90cb0c7c1115898ee2266804daff45
- F src/pcache.c 4121a0571c18581ee9f82f086d5e2030051ebd6a
- F src/pcache.h 9b559127b83f84ff76d735c8262f04853be0c59a
- F src/pcache1.c e412cb585f777c840ddce0500eddc5c6043c2bb5
+ F src/pcache.c ace1b67632deeaa84859b4c16c27711dfb7db3d4
+ F src/pcache.h b44658c9c932d203510279439d891a2a83e12ba8
+ F src/pcache1.c facbdd3ecc09c8f750089d941305694301328e98
 -F src/pragma.c 3f3e959390a10c0131676f0e307acce372777e0f
 -F src/prepare.c b7b7bf020bd4c962f7c8aed5a3c542c7dfe9f9c7
 +F src/pragma.c c63b5aa7b655801cf74b7f94fdb136f4d9626522
 +F src/prepare.c 307a3ddc2f087df85114c5e4bfcc4a55c9970cde
- F src/printf.c 10a2493593c8e4a538915cd3674bd7a67f70c488
+ F src/printf.c 9e75a6a0b55bf61cfff7d7e19d89834a1b938236
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
  F src/resolve.c 4965007d6497b6a4d7a6d98751cc39712885f952
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
 -F src/select.c 428165951748151e87a15295b7357221433e311b
 +F src/select.c 00edeea62174d9fc5e010e0044f2af64233cf602
- F src/shell.c 282f8f5278e0c78eb442217531172ec9e1538796
- F src/sqlite.h.in bcddafefaea18c0af74df5f2b1c4067c4c7013e6
+ F src/shell.c bc28d5992109717c87804e2eb1a08a7c8cc7a2fd
 -F src/sqlite.h.in 0c5c0df7e4e436dfc5592511325bf4a96f6a638d
++F src/sqlite.h.in 0abc2ddd9601e530b471847c73a4379ab50854b6
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
 +F src/sqlite3_private.h a81a9c5f97c095cc3e86914a05f8fabe0011f4a1
  F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d
- F src/sqliteInt.h b156fa7ce542e3d54951b92d77052c3aa9d80b03
 -F src/sqliteInt.h 71b0bf1a7fc55b5cb374f7579fd140e730a6e0f4
++F src/sqliteInt.h f9240915e0ccd579f6cab7b23d419f181665f687
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 81712116e826b0089bb221b018929536b2b5406f
  F src/table.c f142bba7903e93ca8d113a5b8877a108ad1a27dc
- F src/tclsqlite.c c67d310c833046cccc192125d64ad422ab882684
- F src/test1.c 52c2dbb3159621b6e9ea959575c08cd382d2246f
+ F src/tclsqlite.c 0a874655dd39a9875e39c5d3c464db662171d228
 -F src/test1.c 6b0469b8e06c77b1de1d3e4a3834cf26edea9cc7
++F src/test1.c d9d4d9174e9e320e079e437ddbfd1c7e6cb9e8c0
  F src/test2.c 98049e51a17dc62606a99a9eb95ee477f9996712
  F src/test3.c 1c0e5d6f080b8e33c1ce8b3078e7013fdbcd560c
  F src/test4.c 9b32d22f5f150abe23c1830e2057c4037c45b3df
@@@ -252,9 -249,10 +253,10 @@@ F src/test8.c 54ccd7b1df5062f0ecbf50a8f
  F src/test9.c bea1e8cf52aa93695487badedd6e1886c321ea60
  F src/test_async.c 21e11293a2f72080eda70e1124e9102044531cd8
  F src/test_autoext.c dea8a01a7153b9adc97bd26161e4226329546e12
 -F src/test_backup.c 3875e899222b651e18b662f86e0e50daa946344e
 +F src/test_backup.c 2e6e6a081870150f20c526a2e9d0d29cda47d803
+ F src/test_blob.c 1f2e3e25255b731c4fcf15ee7990d06347cb6c09
  F src/test_btree.c 2e9978eca99a9a4bfa8cae949efb00886860a64f
- F src/test_config.c 42d34cb7d3218e2176a92a2fc21c929596eb6e0d
 -F src/test_config.c 035c17a173937d019b8dfc1d524f9d3fc8123504
++F src/test_config.c 2cb46d68a20f26d89899b64069a1cff9fb6f7e36
  F src/test_demovfs.c 69b2085076654ebc18014cbc6386f04409c959a9
  F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc
  F src/test_fs.c ced436e3d4b8e4681328409b8081051ce614e28f
@@@ -292,23 -290,23 +294,23 @@@ F src/trigger.c 25571661fdeae8c7f975ff4
  F src/update.c 3c4ecc282accf12d39edb8d524cf089645e55a13
  F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
  F src/util.c 3b627daa45c7308c1e36e3dbaa3f9ce7e5c7fa73
- F src/vacuum.c 59f03f92bcff57faa6a8ca256eb29ccddfb0614a
- F src/vdbe.c d9245b3b5b1f4dc80d3979a58f6d4d9508604163
- F src/vdbe.h 09f5b4e3719fa454f252322b1cdab5cf1f361327
- F src/vdbeInt.h acc36ac461f973f46ac7942f86abdd93d2f8cfbc
- F src/vdbeapi.c 08f16b5d0d7ac370f03332161be5c27a34a195d0
- F src/vdbeaux.c 8990f551f34db71800ae0f66879ab2ec1a7afec4
- F src/vdbeblob.c 8b5442ff0954c44b45cbabbe2e94091a2e16fdef
+ F src/vacuum.c 9b30ec729337dd012ed88d4c292922c8ef9cf00c
 -F src/vdbe.c 5563459c06c434bc43131044fcf8164654008ebd
++F src/vdbe.c cb6dab39d71464050c186efead93a68fcacd82b0
+ F src/vdbe.h 6fc69d9c5e146302c56e163cb4b31d1ee64a18c3
+ F src/vdbeInt.h 9bb69ff2447c34b6ccc58b34ec35b615f86ead78
 -F src/vdbeapi.c 07acb615d1e4170e71fc1b0d087f3c53a1ad8e83
 -F src/vdbeaux.c 9b0a251b6dfab349dd6c6efb40062eb7386b26f5
++F src/vdbeapi.c 55cd14500f305264983952b816d3d3ce91501b3a
++F src/vdbeaux.c 7354ce66d5e919d2d54c9fa42aeda64711487a44
+ F src/vdbeblob.c 4af4bfb71f6df7778397b4a0ebc1879793276778
  F src/vdbemem.c 31d8eabb0cd78bfeab4e5124c7363c3e9e54db9f
- F src/vdbesort.c 975aeffa99acb0991b2f288d30294756bff41438
+ F src/vdbesort.c 87f3923483113d1c95d84640becb4e4946f27d9a
  F src/vdbetrace.c 7e4222955e07dd707a2f360c0eb73452be1cb010
  F src/vtab.c 2a30791bbd7926b589401bd09c3abb33de563793
- F src/wal.c 1c4bcbbe80d5714e4ae349b9d94d05dcfb7804b7
 -F src/wal.c fa090966140602f03a621f87d82ee69e66ca63b5
 -F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
++F src/wal.c bb8e3f9adf475ef8a644d1b678d4d0114321b19d
 +F src/wal.h 6b3a67ecd7172dcc9f18fc9cd4d76dc4c2166e68
  F src/walker.c c253b95b4ee44b21c406e2a1052636c31ea27804
- F src/where.c 5665df88cbd2b38eb72b4b94c8892c8afb360181
- F src/whereInt.h 19279cd0664ce1d90b9ad3ef0108cb494acfe455
+ F src/where.c 3862a1173ae2716bde12f1ab3fb649f1d85b05c2
+ F src/whereInt.h d3633e9b592103241b74b0ec76185f3e5b8b62e0
 -F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 +F test/8_3_names.test 05034aadccd2253ffe6cbefb06662b8aa4600f77
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
  F test/aggnested.test b35b4cd69fc913f90d39a575e171e1116c3a4bb7
  F test/alias.test 4529fbc152f190268a15f9384a5651bbbabc9d87
@@@ -381,12 -380,12 +384,12 @@@ F test/boundary4.tcl 0bb4b1a94f4fc5ae59
  F test/boundary4.test 89e02fa66397b8a325d5eb102b5806f961f8ec4b
  F test/btreefault.test c2bcb542685eea44621275cfedbd8a13f65201e3
  F test/busy.test 76b4887f8b9160ba903c1ac22e8ff406ad6ae2f0
 -F test/cache.test 13bc046b26210471ca6f2889aceb1ea52dc717de
 +F test/cache.test 0bc2195f4a7207108af2617ed356e77daf4412f7
  F test/capi2.test 011c16da245fdc0106a2785035de6b242c05e738
- F test/capi3.test 71bcf2fbd36a9732f617766dfd752552c8e491b5
+ F test/capi3.test f0718f4f90d0efdc980119bfbdf1d7f1541ee5ef
  F test/capi3b.test efb2b9cfd127efa84433cd7a2d72ce0454ae0dc4
- F test/capi3c.test a21869e4d50d5dbb7e566e328fc0bc7c2efa6a32
- F test/capi3d.test c84af0c49267f9c3fbf4c1c46aa647646023811e
+ F test/capi3c.test fdc0d67a2cb8e8fc400d5b7735e330161ea057a2
+ F test/capi3d.test a82b6321c50a1cfc848e386fa2c851893606f68c
  F test/capi3e.test 3d49c01ef2a1a55f41d73cba2b23b5059ec460fe
  F test/cast.test 4c275cbdc8202d6f9c54a3596701719868ac7dc3
  F test/check.test 5831ddb6f2c687782eaf2e1a07b6e17f24c4f763
@@@ -624,10 -627,10 +631,10 @@@ F test/in.test 047c4671328e9032ab95666a
  F test/in2.test 5d4c61d17493c832f7d2d32bef785119e87bde75
  F test/in3.test 3cbf58c87f4052cee3a58b37b6389777505aa0c0
  F test/in4.test d2b38cba404bc4320f4fe1b595b3d163f212c068
- F test/in5.test 99f9a40af01711b06d2d614ecfe96129f334fba3
+ F test/in5.test 1de657472fa9ac2924be25c2c959ac5ca1aae554
  F test/incrblob.test e81846d214f3637622620fbde7cd526781cfe328
  F test/incrblob2.test bf4d549aa4a466d7fbe3e3a3693d3861263d5600
 -F test/incrblob3.test d8d036fde015d4a159cd3cbae9d29003b37227a4
 +F test/incrblob3.test 5fa6f2665ae37da05928bb16851d4f86515af78a
  F test/incrblob4.test f26502a5697893e5acea268c910f16478c2f0fab
  F test/incrblob_err.test af1f12ba60d220c9752073ff2bda2ad59e88960d
  F test/incrblobfault.test 280474078f6da9e732cd2a215d3d854969014b6e
@@@ -1215,7 -1221,7 +1226,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 10aaf3b148404df7912d9604ccb6921173e7ac80 67f0d469da28c023200239a1f3d0c6cef9ef0e45
- R d75441d29aa3f6ecbfd2cd8a5bc75226
 -P 2896f2640ab3e102ee248d20fb68c497817524eb 945a9e687fdfee5f7103d85d131024e85d594ac3
 -R 8b4c6ed5b267d5d2bc5845aacffad250
++P fef8430f1284b08b1c2af3d5639037478c58fb7e 296b0c7397790ceadbdb330959e962f6491abc3e
++R 2408dd0cf483fbae1ba2b14cf3257c3f
  U drh
- Z 6cec1210c9b1edbcdcdcba90a9e22572
 -Z 0fc13d2fc810c826601883122c184fdf
++Z a0174c63e338cb811c512af66228b273

diff --cc manifest.uuid
index 91f2eec2d8180692b9ba19a7ce9510af91563085,75b72440d459aa0d7816e6cbc765e97ccde46562..37ada271b928b8ed8e537a5aa2aee25ef914dbcf
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- fef8430f1284b08b1c2af3d5639037478c58fb7e
 -296b0c7397790ceadbdb330959e962f6491abc3e
++ccb601f6dffba68a57d82db2d046aa27f6f1b755

diff --cc src/btree.c
Simple merge

diff --cc src/main.c
Simple merge

diff --cc src/os_win.c
Simple merge

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

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/test1.c
Simple merge

diff --cc src/test_config.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/wal.c
Simple merge