Merge the latest trunk enhancements into the apple-osx branch.

FossilOrigin-Name: a2bd81e575321e23f08d8dc56d4682adb44a513b

diff --cc manifest
index 607564531b996af7b0032767d18092607bf1d0ff,2022595ba26778f832a5c0a60033822a475da593..095dc2a0983f5dbbae0de432704d2e0a06556bd5
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,7 -1,7 +1,7 @@@
- C Merge\sall\srecent\strunk\senhancements\sand\sespecially\sthe\sblocking\sWAL-lock\sfix\ninto\sthe\sapple-osx\sbranch.
- D 2015-03-21T17:00:06.514
 -C Suppress\sa\scompiler\swarning\sthat\swas\sappearing\swith\sSQLITE_THREADSAFE=0.
 -D 2015-03-24T18:19:39.691
++C Merge\sthe\slatest\strunk\senhancements\sinto\sthe\sapple-osx\sbranch.
++D 2015-03-24T18:49:59.439
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in 88a3e6261286db378fdffa1124cad11b3c05f5bb
 +F Makefile.in e1da335f215ba86fe687f4d963a45156f3da603e
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
  F Makefile.msc cd626b52ebeec0e2c0dd929243bdd25b0df19a71
  F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
@@@ -176,7 -173,7 +176,7 @@@ F src/auth.c b56c78ebe40a2110fd361379f7
  F src/backup.c ff743689c4d6c5cb55ad42ed9d174b2b3e71f1e3
  F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb
  F src/btmutex.c 45a968cc85afed9b5e6cf55bf1f42f8d18107f79
- F src/btree.c 22086fbd6843dda1e424fb63a1d40bc6df35f5a6
 -F src/btree.c 3e320cac836546c905bd90007074d887980aa70e
++F src/btree.c 13590ad35778d9bcd17644956003f849f95ed745
  F src/btree.h 969adc948e89e449220ff0ff724c94bb2a52e9f1
  F src/btreeInt.h 2bfefc01875d8da066504c233ec259fcb3b2ef72
  F src/build.c 0419bba592c22f6d00e6d57a2ca7136720d02c1a
@@@ -195,11 -192,11 +195,11 @@@ 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 370cee136ae6c509a2954da7da75b1ae83c59946
- F src/malloc.c 740db54387204c9a2eb67c6d98e68b08e9ef4eab
 -F src/main.c 569d45ba9eb4fbdd631d53f440bcdb4a35ab1505
++F src/main.c f327b9978cae73f09eab089f878cf9e300cf9a41
+ F src/malloc.c e818a0db9ac0898f9dc74002f3a5baca32232d05
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c abe6ee469b6c5a35c7f22bfeb9c9bac664a1c987
  F src/mem2.c f1940d9e91948dd6a908fbb9ce3835c36b5d83c3
@@@ -217,34 -214,33 +217,34 @@@ 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 181f73696df260983977e4008dd0f6be5952493f
 -F src/os_unix.c a4dadbc2da41599e99093e91e276c38c17a73b89
 -F src/os_win.c 8223e7db5b7c4a81d8b161098ac3959400434cdb
++F src/os_unix.c 895648d4453400e599aa13f5547b96931264ac84
 +F src/os_win.c 1d1ef630b3e3859b7399952909e10d3a4d43fc77
  F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca
 -F src/pager.c 4120a49ecd37697e28f5ed807f470b9c0b88410c
 -F src/pager.h c3476e7c89cdf1c6914e50a11f3714e30b4e0a77
 +F src/pager.c 694caffb16891a96608193968d7c9a8fa9a71240
 +F src/pager.h 5ead19acf64a16b7b663476bd36c60d26f03a696
  F src/parse.y 1299c66e7b1707322ccd8af43a359b8fb0d46d72
  F src/pcache.c 10539fb959849ad6efff80050541cab3d25089d4
  F src/pcache.h b44658c9c932d203510279439d891a2a83e12ba8
- F src/pcache1.c 1e77432b40b7d3288327d9cdf399dcdfd2b6d3bf
+ F src/pcache1.c 69d137620a305f814398bd29a0c998038c0695e9
 -F src/pragma.c ac4f3f856b4234e85f55b0f069698a4766011100
 +F src/pragma.c 21af63d913216da9ee45774bc381b9bd781d3a63
  F src/pragma.h 09c89bca58e9a44de2116cc8272b8d454657129f
 -F src/prepare.c 173a5a499138451b2561614ecb87d78f9f4644b9
 +F src/prepare.c 01740b0d6b8f5c6da421a86c300464ff5b53e167
  F src/printf.c 8da9a2687a396daa19860f4dc90975d319304744
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
  F src/resolve.c f4d79e31ffa5820c2e3d1740baa5e9b190425f2b
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
 -F src/select.c 72ffb62e2879956302140e9f6e6ae88aee36b0e5
 +F src/select.c ca8b52422e9c525ab62304526aee4b7b15df8795
- F src/shell.c 9c1589c8271c04c02d23cdbc2c07bb40752fa9eb
- F src/sqlite.h.in 2f47537efda60acd8a6232433a5e1401308b3bd6
+ F src/shell.c 3ae1e53878d2804fe77b8c8f1f6ca287a0e5d80e
 -F src/sqlite.h.in 2f9606a682af372415ce9d1f244183c5cc8385aa
++F src/sqlite.h.in 4f924944f132fb5554e5a247060ccd5729455b62
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
 +F src/sqlite3_private.h a81a9c5f97c095cc3e86914a05f8fabe0011f4a1
  F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d
- F src/sqliteInt.h 70be3eae583a7d24bbb9a86572f813e58bd4883f
 -F src/sqliteInt.h bedf15914c09bfb5fe3ec4e3f211a4a6fc42cd33
++F src/sqliteInt.h e3d6df1934321a4f6778076215ff62f78c371018
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
- F src/status.c 81712116e826b0089bb221b018929536b2b5406f
+ F src/status.c f266ad8a2892d659b74f0f50cb6a88b6e7c12179
  F src/table.c e7a09215315a978057fb42c640f890160dbcc45e
  F src/tclsqlite.c fa72a7c5278662357c105ba7925c1d0972506ff9
 -F src/test1.c 90fbedce75330d48d99eadb7d5f4223e86969585
 +F src/test1.c 1fe65ec71cf2eae982c70cf80127d502d46bb341
  F src/test2.c 577961fe48961b2f2e5c8b56ee50c3f459d3359d
  F src/test3.c 64d2afdd68feac1bb5e2ffb8226c8c639f798622
  F src/test4.c d168f83cc78d02e8d35567bb5630e40dcd85ac1e
@@@ -297,19 -293,19 +297,19 @@@ F src/update.c 3c4ecc282accf12d39edb8d5
  F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
  F src/util.c 98a7627ca48ad3265b6940915a1d08355eb3fc7e
  F src/vacuum.c 9460b9de7b2d4e34b0d374894aa6c8a0632be8ec
- F src/vdbe.c 9ece90dfaae797b5ea2caf55e5741375d2393ed5
 -F src/vdbe.c bbfede5a8a6908b3ddcd55fdb0b2301288dd4754
++F src/vdbe.c f2c639806aeb71bdc6559450c4d93c8004ede064
  F src/vdbe.h 6fc69d9c5e146302c56e163cb4b31d1ee64a18c3
- F src/vdbeInt.h bb56fd199d8af1a2c1b9639ee2f70724b4338e3a
+ F src/vdbeInt.h 9cbaa84f53ddd2d09a0cf61a94337a3a035d08a0
 -F src/vdbeapi.c 583d56b129dd27f12bed518270de9ebe521e6a75
 -F src/vdbeaux.c 413dc496248ac18eb0c19e35e86bb1ffd47b8907
 +F src/vdbeapi.c 36861a49fcb11325e2fce937418b06ce1e3de1a8
- F src/vdbeaux.c 22b3068248279493a493fec70752ccbbca1f792c
++F src/vdbeaux.c ca50e73011987cee061f7615df920a48a33f3299
  F src/vdbeblob.c 4f2e8e075d238392df98c5e03a64342465b03f90
  F src/vdbemem.c c0dc81285b7571b0a31c40f17846fe2397ec1cd9
  F src/vdbesort.c 919717d7599fa31d343ec28bffd0f9e91a4ff5f6
  F src/vdbetrace.c 7e4222955e07dd707a2f360c0eb73452be1cb010
- F src/vtab.c 1680f58978ae014a331d99b4c87316d079056c5e
+ F src/vtab.c 62d49237bd8f3be4863815a39387b0f9897fa5e1
  F src/vxworks.h c18586c8edc1bddbc15c004fa16aeb1e1342b4fb
 -F src/wal.c 878c8e1a51cb2ec45c395d26b7d5cd9e1a098e4a
 -F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
 +F src/wal.c 5351d6e7c7519e484d8ad2c55e6ea52d361baa28
 +F src/wal.h 6b3a67ecd7172dcc9f18fc9cd4d76dc4c2166e68
  F src/walker.c c253b95b4ee44b21c406e2a1052636c31ea27804
  F src/where.c 85d832efa5ef57de542db7f430b72fecd3af8b38
  F src/whereInt.h cbe4aa57326998d89e7698ca65bb7c28541d483c
@@@ -1251,7 -1246,7 +1251,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 8abbeadbc028524c4a59c1af6c10f724ccb91d0a 717335fcdb15430ed977cbc98d30345b71728b66
- R 775b3d9be861b08d397e30b210180725
 -P cbeb9a1aed8ce3fb569a7717ad03c7c058b68de6
 -R 1df40f85f677c47017b13b63b82a97b5
++P 9f1f8b331e05d88052e6fb6556a88591efaa44bf 436314b5728c9413f9ac2d837e1c19364f31be72
++R 6a40cc3f4e2d4b303110c9f5312a11bc
  U drh
- Z a3a4f891a9dbb662947b3c944b175f66
 -Z 408df2ac27dc537c38335d50565b918f
++Z bea17ae22d7d9444e0bc1c71a1dd6120

diff --cc manifest.uuid
index cc7dabb15bf0fdd6ad150c4472a9110a45ca953b,b639b7d8cc31ea7e4ea5e61a8d7b52b19fa86e6b..cfa397fe6b23dde826106b8d192be0079f9310e4
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 9f1f8b331e05d88052e6fb6556a88591efaa44bf
 -436314b5728c9413f9ac2d837e1c19364f31be72
++a2bd81e575321e23f08d8dc56d4682adb44a513b

diff --cc src/btree.c
Simple merge

diff --cc src/main.c
Simple merge

diff --cc src/os_unix.c
Simple merge

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

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc src/vdbeaux.c
Simple merge