Merge latest enhancements, including the SQLITE_ENABLE_API_ARMOR patch,

from trunk.

FossilOrigin-Name: 10aaf3b148404df7912d9604ccb6921173e7ac80

diff --cc manifest
index e8029188fc28fe0bf8cbd26ec23a623770f721cd,e658f3a76a8b42c54f90a903653f3f4066a66c84..b29a93a198c1bc1970281e674715bf2f7b43c419
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,7 -1,7 +1,7 @@@
- C Merge\sthe\s3.8.7\schanges\sinto\sthe\sapple-osx\sbranch.
- D 2014-10-17T12:11:07.064
 -C Add\sthe\sSQLITE_ENABLE_API_ARMOR\scompile-time\soption\sfor\sextra\sAPI\sparameter\nvalidation.\s\sEnhance\ssqlite3_stricmp(),\ssqlite3_strnicmp(),\sand\nsqlite3_uri_parameter()\sfor\simproved\sNULL\sparameter\shandling.
 -D 2014-10-27T18:34:07.031
++C Merge\slatest\senhancements,\sincluding\sthe\sSQLITE_ENABLE_API_ARMOR\spatch,\nfrom\strunk.
++D 2014-10-27T18:42:03.141
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a
 +F Makefile.in bf041d20aeed250922fb1ba4bd13d34d3fa470e9
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
  F Makefile.msc e31dee24038965fb6269d6d61073fd6b7e331dec
  F Makefile.vxworks 034289efa9d591b04b1a73598623119c306cbba0
@@@ -169,35 -166,35 +169,35 @@@ F sqlite.pc.in 42b7bf0d02e08b9e77734a47
  F sqlite3.1 3d8b83c91651f53472ca17599dae3457b8b89494
  F sqlite3.pc.in 48fed132e7cb71ab676105d2a4dc77127d8c1f3a
  F src/alter.c ba266a779bc7ce10e52e59e7d3dc79fa342e8fdb
- F src/analyze.c 8c322e1ecc08909526dbd5ab4421889d05f2263d
+ F src/analyze.c afbcca663c3f3625340b8e30d440cd7a97ded6bc
  F src/attach.c f4e94df2d1826feda65eb0939f7f6f5f923a0ad9
- F src/auth.c d8abcde53426275dab6243b441256fcd8ccbebb2
- F src/backup.c a31809c65623cc41849b94d368917f8bb66e6a7e
+ F src/auth.c b56c78ebe40a2110fd361379f7e8162d23f92240
+ F src/backup.c 7f841396adfd47507ff670a471162d2bfcda3136
  F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb
  F src/btmutex.c 49ca66250c7dfa844a4d4cb8272b87420d27d3a5
- F src/btree.c ad424e72852a105811bf08c516c8ade5d43507a0
 -F src/btree.c 812c03daa8be68daf623dd0349ecb18e9f988967
++F src/btree.c ef97f308df353d09545fc39f0d89b25afd0a5cda
  F src/btree.h a79aa6a71e7f1055f01052b7f821bd1c2dce95c8
  F src/btreeInt.h 026d0129724e8f265fdc60d44ec240cf5a4e6179
- F src/build.c 9dc2bd94347b878c89627000c92b0c8d97ec2919
+ F src/build.c 67bb05b1077e0cdaccb2e36bfcbe7a5df9ed31e8
  F src/callback.c 7b44ce59674338ad48b0e84e7b72f935ea4f68b0
- F src/complete.c 535183afb3c75628b78ce82612931ac7cdf26f14
- F src/ctime.c bb434068b5308a857b181c2d204a320ff0d6c638
+ F src/complete.c c4ba6e0626bb94bc77a0861735f3382fcf7cc818
+ F src/ctime.c dfa83bfebb4201d07b16534acb8a0149592c3a25
  F src/date.c 57a7f9ba9f6b4d5268f5e411739066a611f99036
  F src/delete.c fae81cc2eb14b75267d4f47d3cfc9ae02aae726f
- F src/expr.c fc204d08af06437ddaffe5a1b1f1f6f9e1a55d6d
+ F src/expr.c 0391a657df4959eaf2a2fd7d77de5ebe750686ee
  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/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 8185a7af2a5cdfb7d83c4a62871c7e8e9b53477b
 -F src/main.c 2b882f64580ea72e2d972a5296f9eaa75a353161
++F src/main.c 0e55414274994377ecf2c28a4196b4fe7813d7d0
  F src/malloc.c 3c3ac67969612493d435e14b6832793209afd2ec
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c faf615aafd8be74a71494dfa027c113ea5c6615f
@@@ -208,40 -205,39 +208,40 @@@ F src/memjournal.c 3eb2c0b51adbd869cb6a
  F src/mutex.c 84a073c9a23a8d7bdd2ea832522d1730df18812c
  F src/mutex.h 779d588e3b7756ec3ecf7d78cde1d84aba414f85
  F src/mutex_noop.c f3f09fd7a2eb4287cfc799753ffc30380e7b71a1
- F src/mutex_unix.c 1b10d5413dfc794364a8adf3eb3a192926b43fa3
+ F src/mutex_unix.c 551e2f25f0fa0ee8fd7a43f50fc3d8be00e95dde
  F src/mutex_w32.c 06bfff9a3a83b53389a51a967643db3967032e1e
  F src/notify.c 9711a7575036f0d3040ba61bc6e217f13a9888e7
- F src/os.c 25df79baf4bec87f75a2c4e995d63361b66b918a
 -F src/os.c 8fd25588eeba74068d41102d26810e216999b6c8
++F src/os.c 5822c2b843a77219bba1e28887cdc816b27ca29d
  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 a019caaae2bcbbc0cc4c39af6e7d7e43d8426053
 +F src/os_unix.c 2af3813fd2df6f5d016d1dfef541d2c9e98fd600
 +F src/os_win.c 752a65dc7e6f28379052776dca52ebeaeaffb12f
  F src/os_win.h 09e751b20bbc107ffbd46e13555dc73576d88e21
- F src/pager.c 83e9a7af13a85244903e0c69d213b4852b7fcbb0
- F src/pager.h 8feb18f845951ab37e1f65a319b2da24185173ac
 -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/pragma.c 3f3e959390a10c0131676f0e307acce372777e0f
 -F src/prepare.c b7b7bf020bd4c962f7c8aed5a3c542c7dfe9f9c7
 +F src/pragma.c c63b5aa7b655801cf74b7f94fdb136f4d9626522
- F src/prepare.c d0ab75c13fdcad7f54a385386c6b04408ef43615
- F src/printf.c 6b79bbd063dcbadca4cf617a4cde255bcc13ea64
- F src/random.c d10c1f85b6709ca97278428fd5db5bbb9c74eece
- F src/resolve.c a3466128b52a86c466e47ac1a19e2174f7b5cf89
++F src/prepare.c 307a3ddc2f087df85114c5e4bfcc4a55c9970cde
+ F src/printf.c c31012ac23e458081df4a32634b60424e0cdfaf3
+ F src/random.c b8a058131851de1a37801b5587845ee73411c064
+ F src/resolve.c 4965007d6497b6a4d7a6d98751cc39712885f952
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
 -F src/select.c 428165951748151e87a15295b7357221433e311b
 +F src/select.c 00edeea62174d9fc5e010e0044f2af64233cf602
- F src/shell.c 18ee8bbe9502d8848072dc2eddd1ea09254ba494
+ F src/shell.c 282f8f5278e0c78eb442217531172ec9e1538796
 -F src/sqlite.h.in 4a5e5158c189d2bcd45c7c4607c2c0eb6d25c153
 +F src/sqlite.h.in b03be63c5f671cfbdbeaf3197a9837b426053973
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
 +F src/sqlite3_private.h a81a9c5f97c095cc3e86914a05f8fabe0011f4a1
  F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d
- F src/sqliteInt.h 0c5e6587059c00943708321fb72d4224806fb393
 -F src/sqliteInt.h 90519c3b3e8ee90adfce013234c4bd07275d77b5
++F src/sqliteInt.h 327b70f8182a53dc2d2cf03db449bace326fe84f
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
- F src/status.c 961d5926e5a8fda611d385ec22c226b8635cd1cb
- F src/table.c 2e99ef7ef16187e17033d9398dc962ce22dab5cb
+ F src/status.c 81712116e826b0089bb221b018929536b2b5406f
+ F src/table.c f142bba7903e93ca8d113a5b8877a108ad1a27dc
  F src/tclsqlite.c c67d310c833046cccc192125d64ad422ab882684
- F src/test1.c 226349f42ce755148e6ba7bd74a85020a41dbd59
 -F src/test1.c 63d4b1707c4052cf9c05c1cbb4a62666d70a0b48
++F src/test1.c 52c2dbb3159621b6e9ea959575c08cd382d2246f
  F src/test2.c 98049e51a17dc62606a99a9eb95ee477f9996712
  F src/test3.c 1c0e5d6f080b8e33c1ce8b3078e7013fdbcd560c
  F src/test4.c 9b32d22f5f150abe23c1830e2057c4037c45b3df
@@@ -291,24 -287,24 +291,24 @@@ F src/tokenize.c cc9016e5007fc5e7678907
  F src/trigger.c 25571661fdeae8c7f975ff40ffec205520a3f92f
  F src/update.c 729f6f18fc27740591d085e1172cebe311144bf0
  F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
- F src/util.c 4006c01772bd8d8ac4306d523bbcee41d3e392d8
+ F src/util.c 3b627daa45c7308c1e36e3dbaa3f9ce7e5c7fa73
  F src/vacuum.c 59f03f92bcff57faa6a8ca256eb29ccddfb0614a
 -F src/vdbe.c 5ee15a66ce07e0482b92aa29e4dd0c5827a22d79
 +F src/vdbe.c 678170cc7e8217b1926ead14108bc7d87202b3d9
  F src/vdbe.h 09f5b4e3719fa454f252322b1cdab5cf1f361327
  F src/vdbeInt.h e2a060a55ee18a6ab973353a5e2ec7ee569bf787
- F src/vdbeapi.c 72c51192faa562c8859bdc3223ea5e2ecab2f418
 -F src/vdbeapi.c 02d8afcff710eb35e3d9e49cb677308296b00009
 -F src/vdbeaux.c edbb7a9c8b2a8f7a68ac75c2475edd4040266b76
++F src/vdbeapi.c 08f16b5d0d7ac370f03332161be5c27a34a195d0
 +F src/vdbeaux.c df93c769d7f04d829ec247d5c054bd7d4855a8e0
- F src/vdbeblob.c 848238dc73e93e48432991bb5651bf87d865eca4
+ F src/vdbeblob.c 8b5442ff0954c44b45cbabbe2e94091a2e16fdef
  F src/vdbemem.c 31d8eabb0cd78bfeab4e5124c7363c3e9e54db9f
  F src/vdbesort.c 975aeffa99acb0991b2f288d30294756bff41438
  F src/vdbetrace.c 7e4222955e07dd707a2f360c0eb73452be1cb010
- F src/vtab.c cb0c194303fea276b48d7d4b6d970b5a96bde8de
+ F src/vtab.c 2a30791bbd7926b589401bd09c3abb33de563793
 -F src/wal.c 10e7de7ce90865a68153f001a61f1d985cd17983
 -F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
 +F src/wal.c 1c4bcbbe80d5714e4ae349b9d94d05dcfb7804b7
 +F src/wal.h 6b3a67ecd7172dcc9f18fc9cd4d76dc4c2166e68
  F src/walker.c c253b95b4ee44b21c406e2a1052636c31ea27804
- F src/where.c 2947912f1f3d6a7766fe087fd532a5d688d745b1
- F src/whereInt.h 124d970450955a6982e174b07c320ae6d62a595c
+ F src/where.c 4ce8c4826b7f86d080f0ed4e7a9045bb5014be77
+ F src/whereInt.h 19279cd0664ce1d90b9ad3ef0108cb494acfe455
 -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
@@@ -1209,7 -1207,8 +1212,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 880df7568add1b5825f713688dcd7a03cd895389 e4ab094f8afce0817f4074e823fabe59fc29ebb4
- R 56104ee61b6669d8536a27b703e39519
 -P 637246165a14c4808b90d0437e4d43fa5fac659e 1c220b806d56e163842e17038c3331f71861bd9c
 -R 78cdca5c720e64c06c4c8ef41bcc31b7
 -T +closed 1c220b806d56e163842e17038c3331f71861bd9c
++P aa7bbed10b63078dcd3468b7b47c30044bc8586d ffb9d8144bbc35bf3d929e0e13a663668fff0558
++R e56599e5c5a46d09625a0813528cde99
  U drh
- Z 05f88ae18aa702684a55945462f4f9ae
 -Z 1739c9dd8a9fd2ca84e2afadfbbcea12
++Z c433a369e302775250ebbecbc499fc64

diff --cc manifest.uuid
index 63a97b3e899a790f8e4ffe44711a46a1af9e4c74,2f7fda9cbae9f6d0032da13b689aabb15c8f3062..e36c8bc79941edb5937cd9b19e9f4fd5a91d6628
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- aa7bbed10b63078dcd3468b7b47c30044bc8586d
 -ffb9d8144bbc35bf3d929e0e13a663668fff0558
++10aaf3b148404df7912d9604ccb6921173e7ac80

diff --cc src/btree.c
Simple merge

diff --cc src/main.c
Simple merge

diff --cc src/os.c
Simple merge

diff --cc src/pager.c
Simple merge

diff --cc src/pager.h
Simple merge

diff --cc src/prepare.c
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/test1.c
Simple merge

diff --cc src/vdbeapi.c
Simple merge