Enhancements to SQLITE_ENABLE_API_ARMOR merged from trunk.

FossilOrigin-Name: 5147b94ae6dc3e1bae5c506563347880c3a302b1

diff --cc manifest
index fc24938947cc885c147b53fa372bf515c37142d3,9d690c65496793da29b10ed5c99d2758e24897b4..a997a4c2fc8c2a90ce01ee3efd0d5e0808514006
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,7 -1,7 +1,7 @@@
- C Merge\sall\srecent\strunk\sfixes\sand\senhancements\sinto\sthe\sapple-osx\sbranch.
- D 2015-02-13T12:13:43.557
 -C Improvements\sto\sSQLITE_ENABLE_API_ARMOR.
 -D 2015-02-13T16:36:14.430
++C Enhancements\sto\sSQLITE_ENABLE_API_ARMOR\smerged\sfrom\strunk.
++D 2015-02-13T16:42:49.659
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in 6b9e7677829aa94b9f30949656e27312aefb9a46
 +F Makefile.in e1f1fce0d47e29ffae67c92834d0e6e1c699743e
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
  F Makefile.msc fc6b0b233b5621f3e56298e4d6a0b3f6c936c520
  F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
@@@ -176,10 -173,10 +176,10 @@@ F src/auth.c b56c78ebe40a2110fd361379f7
  F src/backup.c 7ddee9c7d505e07e959a575b18498f17c71e53ea
  F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb
  F src/btmutex.c 49ca66250c7dfa844a4d4cb8272b87420d27d3a5
 -F src/btree.c 2a1245df0356a229bcd0fd87a8536b5067f16e82
 +F src/btree.c 11945da2e526b6f02a7c24aaf7136adb131aefe9
  F src/btree.h 94277c1d30c0b75705974bcc8b0c05e79c03d474
  F src/btreeInt.h a3d0ae1d511365e1a2b76ad10960dbe55c286f34
- F src/build.c eefaa4f1d86bc3c08023a61fdd1e695b47796975
+ F src/build.c ba45ebd02904e84d98839a6ea74c3eb948596587
  F src/callback.c 7b44ce59674338ad48b0e84e7b72f935ea4f68b0
  F src/complete.c 198a0066ba60ab06fc00fba1998d870a4d575463
  F src/ctime.c 98f89724adc891a1a4c655bee04e33e716e05887
@@@ -195,10 -192,10 +195,10 @@@ F src/hash.h c8f3c31722cf3277d037139097
  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 86bd4e2fccd520b748cba52492ab60c4a770f660
- F src/main.c 47994ce8caf7e02e93db6a531cb6b592293e206f
 -F src/main.c 3780c966059a5fcb0afa42fd89e3b74ec1f72b9e
++F src/main.c 53fe67185c6326a519393a24dddc514a82d80c04
  F src/malloc.c 740db54387204c9a2eb67c6d98e68b08e9ef4eab
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c abe6ee469b6c5a35c7f22bfeb9c9bac664a1c987
@@@ -209,11 -206,11 +209,11 @@@ F src/memjournal.c 3eb2c0b51adbd869cb6a
  F src/msvc.h e78002098966e39b2fd9915bd70b7bc3ec8398b7
  F src/mutex.c 19bf9acba69ca2f367c3761080f8a9f0cf4670a8
  F src/mutex.h 779d588e3b7756ec3ecf7d78cde1d84aba414f85
- F src/mutex_noop.c f3f09fd7a2eb4287cfc799753ffc30380e7b71a1
- F src/mutex_unix.c 551e2f25f0fa0ee8fd7a43f50fc3d8be00e95dde
- F src/mutex_w32.c df48fe07562a45c5c927c45b8d5873a27f98bbb0
+ F src/mutex_noop.c 529bab0743c3321c940f32c3464de494fd38cfa9
+ F src/mutex_unix.c 5cf676464bd19e0a866297515d146e8bf1669dfb
+ F src/mutex_w32.c a6f0b84068db2cbd96a94f23c622aeb875c57dff
  F src/notify.c 9711a7575036f0d3040ba61bc6e217f13a9888e7
 -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
@@@ -226,10 -223,10 +226,10 @@@ F src/parse.y 0f8e7d60f0ab3cb53d270adef
  F src/pcache.c d210cf90d04365a74f85d21374dded65af67b0cb
  F src/pcache.h b44658c9c932d203510279439d891a2a83e12ba8
  F src/pcache1.c 1e77432b40b7d3288327d9cdf399dcdfd2b6d3bf
 -F src/pragma.c ea0be138a99784b14e87bd4522fea40e7b979e9c
 +F src/pragma.c f5c1ba06527a2d72955637e46075a85765f4ad6e
  F src/pragma.h 09c89bca58e9a44de2116cc8272b8d454657129f
 -F src/prepare.c 173a5a499138451b2561614ecb87d78f9f4644b9
 +F src/prepare.c 01740b0d6b8f5c6da421a86c300464ff5b53e167
- F src/printf.c 05edc41450d0eb2c05ef7db113bf32742ae65325
+ F src/printf.c 8da9a2687a396daa19860f4dc90975d319304744
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
  F src/resolve.c f4d79e31ffa5820c2e3d1740baa5e9b190425f2b
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
@@@ -306,9 -302,9 +306,9 @@@ F src/vdbeblob.c 4f2e8e075d238392df98c5
  F src/vdbemem.c 31d8eabb0cd78bfeab4e5124c7363c3e9e54db9f
  F src/vdbesort.c 6d64c5448b64851b99931ede980addc3af70d5e2
  F src/vdbetrace.c 7e4222955e07dd707a2f360c0eb73452be1cb010
- F src/vtab.c c08ec66f45919eaa726bf88aa53eb08379d607f9
+ F src/vtab.c 699f2b8d509cfe379c33dde33827875d5b030e01
 -F src/wal.c 39303f2c9db02a4e422cd8eb2c8760420c6a51fe
 -F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
 +F src/wal.c 61a28dad1a098848a09702a938d515edde5c5a09
 +F src/wal.h 6b3a67ecd7172dcc9f18fc9cd4d76dc4c2166e68
  F src/walker.c c253b95b4ee44b21c406e2a1052636c31ea27804
  F src/where.c d46de821bc604a4fd36fa3928c086950e91aafb1
  F src/whereInt.h d3633e9b592103241b74b0ec76185f3e5b8b62e0
@@@ -1244,7 -1239,7 +1244,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 292cf68b4c934c3a666d938d3857f6bd8a484044 3c6ca414879feb1f5d31d5fd95a1737530aca624
- R a4fa39fbad77fa7c6da67fa195c3d3cd
 -P 3c6ca414879feb1f5d31d5fd95a1737530aca624
 -R f6208f1be504ea76c76eb647c7a3e38c
++P b2449d67768f4d3d83877d9c45e5b4b17bb6a551 823ad40ccb5b51aaa0d5a48da63b465df9d0649a
++R 34fbf0e66795550d51489fb09903ffef
  U drh
- Z bc5e67442896497a9aecc645041a623e
 -Z 5fa0aaf45cc565051b14e7b2d21a11e0
++Z ba17bdddc836de1631382089bbd63eae

diff --cc manifest.uuid
index a7e731fb3ffbe2b19b0e6d220087648e725c5493,2047ee0ac5bcbf47c4d3f1ef3539e8b859146bda..75129c4e563c4b7affaf245a473d6bc744691ddf
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- b2449d67768f4d3d83877d9c45e5b4b17bb6a551
 -823ad40ccb5b51aaa0d5a48da63b465df9d0649a
++5147b94ae6dc3e1bae5c506563347880c3a302b1

diff --cc src/main.c
Simple merge