Merge all recent trunk enhances into the apple-osx branch.

FossilOrigin-Name: e709d3b4e7b91331f58ed8319f98790cfb190cb1

diff --cc Makefile.in
Simple merge

diff --cc main.mk
Simple merge

diff --cc manifest
index e5e40b541d94dcee78963d68a8c51b7ca283db64,148ae45ff690fffb855fb1754673cf7ba9d61705..c07e5d7f5352b0e6730e2345807b161a7d0aecd9
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,12 -1,12 +1,12 @@@
- C Merge\sin\sall\sversion\s3.8.9\schanges\sfrom\strunk.
- D 2015-04-08T12:47:26.858
 -C Add\s#ifdef\smagic\sfor\sHAVE_GETHOSTUUID\sso\sthat\sthe\sbuild\swill\shopefully\snow\nwork\son\smore\sverions\sof\sMacOS\swith\sSQLITE_ENABLE_LOCKING_STYLE\sturned\son.
 -D 2015-04-13T23:05:28.978
++C Merge\sall\srecent\strunk\senhances\sinto\sthe\sapple-osx\sbranch.
++D 2015-04-13T23:11:45.828
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in 4cab9a06c126df8330e76b95d890f99cf20e0de6
 -F Makefile.in 5f78b1ab81b64e7c57a75d170832443e66c0880a
++F Makefile.in d4fe123ecc0734164d927b3946bc69c98c579528
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc a8d817fa486d8c88dfbd19ae6a6567d9d350de39
+ F Makefile.msc 0078f5781538e07ea38683439f38d5f5ab79ab6e
  F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
  F README.md d58e3bebc0a4145e0f2a87994015fdb575a8e866
- F VERSION 319eb1ced4b4d17a67730f2b7b85f15c1346cb60
+ F VERSION 2e244662b71e6e68a5c29b014ebc5b7564f4cc5a
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F addopcodes.awk 9eb448a552d5c0185cf62c463f9c173cedae3811
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
@@@ -155,9 -152,9 +155,9 @@@ F ext/userauth/userauth.c 5fa3bdb492f48
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk fb0e6c19ec6e151a8627605aab7d146ec6c459dc
 -F main.mk ddffac494a82d42772df9fe30d3a78acf4f7cb41
++F main.mk 5fcef49677a2ba6c1f2e9eb3dbae3e41c91f549d
  F mkopcodec.awk c2ff431854d702cdd2d779c9c0d1f58fa16fa4ea
- F mkopcodeh.awk c6b3fa301db6ef7ac916b14c60868aeaec1337b5
+ F mkopcodeh.awk d5e22023b5238985bb54a72d33e0ac71fe4f8a32
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
  F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
  F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
@@@ -176,12 -173,12 +176,12 @@@ F src/auth.c b56c78ebe40a2110fd361379f7
  F src/backup.c ff743689c4d6c5cb55ad42ed9d174b2b3e71f1e3
  F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb
  F src/btmutex.c 45a968cc85afed9b5e6cf55bf1f42f8d18107f79
- F src/btree.c a6b1c0efbdaffccc1ac8ecf768c59f440baf5581
 -F src/btree.c 67648f6532c2da79d3b3fb6853aa1a0c3ba0e1ad
++F src/btree.c 66bb78f5a2d38e27b933848e70a97483ebbbe796
  F src/btree.h 969adc948e89e449220ff0ff724c94bb2a52e9f1
  F src/btreeInt.h 973a22a6fd61350b454ad614832b1f0a5e25a1e4
- F src/build.c 0419bba592c22f6d00e6d57a2ca7136720d02c1a
+ F src/build.c fa4795bc795077388aa4e746e1b25ef97bc10489
  F src/callback.c 7b44ce59674338ad48b0e84e7b72f935ea4f68b0
- F src/complete.c 198a0066ba60ab06fc00fba1998d870a4d575463
+ F src/complete.c a5cf5b4b56390cfb7b8636e8f7ddef90258dd575
  F src/ctime.c 98f89724adc891a1a4c655bee04e33e716e05887
  F src/date.c e4d50b3283696836ec1036b695ead9a19e37a5ac
  F src/delete.c 37964e6c1d73ff49cbea9ff690c9605fb15f600e
@@@ -193,12 -190,12 +193,12 @@@ F src/global.c 4f77cadbc5427d00139ba43d
  F src/hash.c 4263fbc955f26c2e8cdc0cf214bc42435aa4e4f5
  F src/hash.h c8f3c31722cf3277d03713909761e152a5b81094
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
- F src/insert.c 5b9243a33726008cc4132897d2be371db12a13be
+ F src/insert.c 305dd3f9539d0affa4bf1c14cc7dffb34867e040
  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 40e333960d53f7d50ee8ce09d40431c87ea653f2
 +F src/main.c a5e55e2b1849352de79260ad277f8ffeb0c4b76e
  F src/malloc.c 6a370b83d54e4bbf6f94021221c2a311cff26a18
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c abe6ee469b6c5a35c7f22bfeb9c9bac664a1c987
@@@ -217,11 -214,11 +217,11 @@@ 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 bd7b5374a279f8fc0f0cc7d827709117e4293268
 -F src/os_unix.c 5ed7e2e453c2980909a6b2c80dc55764b50819a8
 -F src/os_win.c 03d27be3a20048ef52a648d5f0a15f5edda9f2a3
++F src/os_unix.c acd575b6c0dc94afe3a5a21cf789ca1793261feb
 +F src/os_win.c 93f8662844dc935280a1851d15c823f1e6857408
  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
@@@ -233,13 -230,12 +233,13 @@@ F src/printf.c 8ae1fa9d30c1200a9268a390
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
  F src/resolve.c 41aa91af56d960e9414ce1d7c17cfb68e0d1c6cb
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
- F src/select.c 7d05c857d13eb8fffc08e3489e1cd27513ef4b6a
 -F src/select.c 117e0f9ac9254a6f7472fac5144eba21ba0b2ec1
++F src/select.c 8859ea21c0c9c66d85d840aaba75a492d8c4c844
  F src/shell.c 84a1593bd86aaa14f4da8a8f9b16fbc239d262aa
 -F src/sqlite.h.in 278602140d49575e8708e643161f4263e428a02a
 +F src/sqlite.h.in 1d97dd551627efe9284ec65251cbf862fcb1a96d
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
 +F src/sqlite3_private.h a81a9c5f97c095cc3e86914a05f8fabe0011f4a1
  F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d
- F src/sqliteInt.h 160114e383d3d47beb3e5501751a5a4a3c795cce
 -F src/sqliteInt.h 90b7bfd89d7307cd0750663da419ba4bb81e7379
++F src/sqliteInt.h 92d2e2925bb33a29ef7cebd251afec81081411db
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c f266ad8a2892d659b74f0f50cb6a88b6e7c12179
  F src/table.c e7a09215315a978057fb42c640f890160dbcc45e
@@@ -296,24 -292,24 +296,24 @@@ F src/trigger.c 69a91bed7c94e46223e37ff
  F src/update.c 3c4ecc282accf12d39edb8d524cf089645e55a13
  F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
  F src/util.c 98a7627ca48ad3265b6940915a1d08355eb3fc7e
- F src/vacuum.c 9460b9de7b2d4e34b0d374894aa6c8a0632be8ec
- F src/vdbe.c f76aaab78172a258ff134f3e427ff95faaec362d
- F src/vdbe.h 6fc69d9c5e146302c56e163cb4b31d1ee64a18c3
+ F src/vacuum.c 2ddd5cad2a7b9cef7f9e431b8c7771634c6b1701
 -F src/vdbe.c 3f3afd12d4794cb51fe13dc948b1172a5eb71a94
++F src/vdbe.c 7b63a9dfdae77949cd41f1ce6f0eaa9af78609e6
+ F src/vdbe.h 7e538ecf47dccb307ea2d087c3ddc2dd8d70e79d
  F src/vdbeInt.h 9cbaa84f53ddd2d09a0cf61a94337a3a035d08a0
 -F src/vdbeapi.c 583d56b129dd27f12bed518270de9ebe521e6a75
 -F src/vdbeaux.c a20504ae52392459fa08402fda3f195f19d7c79d
 +F src/vdbeapi.c 36861a49fcb11325e2fce937418b06ce1e3de1a8
- F src/vdbeaux.c ca50e73011987cee061f7615df920a48a33f3299
++F src/vdbeaux.c 8d4b5165fbf4fed0ed7fd0f657368965383d2d55
  F src/vdbeblob.c 4f2e8e075d238392df98c5e03a64342465b03f90
  F src/vdbemem.c c0dc81285b7571b0a31c40f17846fe2397ec1cd9
- F src/vdbesort.c 919717d7599fa31d343ec28bffd0f9e91a4ff5f6
+ F src/vdbesort.c 2e7f683464fd5db3be4beaa1ff2d39e24fcb64b8
  F src/vdbetrace.c 7e4222955e07dd707a2f360c0eb73452be1cb010
- F src/vtab.c 62d49237bd8f3be4863815a39387b0f9897fa5e1
+ F src/vtab.c 9ca557215e8591ceb66e0b7c0a579c6df1e54b2d
  F src/vxworks.h c18586c8edc1bddbc15c004fa16aeb1e1342b4fb
- F src/wal.c 5351d6e7c7519e484d8ad2c55e6ea52d361baa28
 -F src/wal.c 753995db83247f20361a8e8a874990b21a75abd9
 -F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
++F src/wal.c de15f46df1161b925a9a509b39bc750f1951cdd7
 +F src/wal.h 6b3a67ecd7172dcc9f18fc9cd4d76dc4c2166e68
  F src/walker.c c253b95b4ee44b21c406e2a1052636c31ea27804
- F src/where.c 85d832efa5ef57de542db7f430b72fecd3af8b38
+ F src/where.c 9952e4749f481707595692f2f13d3ce3b64ffdc8
  F src/whereInt.h cbe4aa57326998d89e7698ca65bb7c28541d483c
 -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
@@@ -1254,7 -1250,7 +1255,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 71b6f507f1c5feb897b8162c468ecf2547a3d50e 8a8ffc862e96f57aa698f93de10dee28e69f6e09
- R 44db3ba6874f6ad63a13081e1a0a07f5
 -P 661db19b34566642dd44ee4cff4ebc093cb8a552
 -R 8591357f8b00a438bdaa3b5a16ff0e3f
++P 301218704cfb6eebac32828b7b2dbc6803c63a26 211411d02c0729c9af0e3cc7e4910db2e7e0d08e
++R 1b6bb6863ad77c6c0aa961642d41539d
  U drh
- Z 6fa29a6db82c1af802c818900a14f266
 -Z d2025877377cf6ead9db7636c81d5974
++Z 659f5a76bd1e1fcea25a13b02607911a

diff --cc manifest.uuid
index 28669e8d2c3450c0e9c0dc252cea374fd105d88d,8657041788fcd091307dc3624b2e4d92f24ae003..63002ea93c67d3fec0e6ab150c95919a9fb0a62f
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 301218704cfb6eebac32828b7b2dbc6803c63a26
 -211411d02c0729c9af0e3cc7e4910db2e7e0d08e
++e709d3b4e7b91331f58ed8319f98790cfb190cb1

diff --cc src/btree.c
Simple merge

diff --cc src/os_unix.c
Simple merge

diff --cc src/select.c
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc src/vdbeaux.c
Simple merge

diff --cc src/wal.c
Simple merge