Merge in all version 3.8.9 changes from trunk.

FossilOrigin-Name: 301218704cfb6eebac32828b7b2dbc6803c63a26

diff --cc manifest
index 667000facd6afaacc9f8578a677a9ccf48870c3f,e3dc7c37f3dfd59b1c040d8eceff7378e8e0b852..e5e40b541d94dcee78963d68a8c51b7ca283db64
--- 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-04-01T16:13:35.905
 -C Version\s3.8.9
 -D 2015-04-08T12:16:33.323
++C Merge\sin\sall\sversion\s3.8.9\schanges\sfrom\strunk.
++D 2015-04-08T12:47:26.858
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in 00d12636df7a5b08af09116bcd6c7bfd49b8b3b4
 +F Makefile.in 4cab9a06c126df8330e76b95d890f99cf20e0de6
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
  F Makefile.msc a8d817fa486d8c88dfbd19ae6a6567d9d350de39
  F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
@@@ -217,29 -214,28 +217,29 @@@ 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 895648d4453400e599aa13f5547b96931264ac84
 -F src/os_unix.c 25b80a3d167da44226a2084dc9e89a6cb1f02e2e
 -F src/os_win.c 03d27be3a20048ef52a648d5f0a15f5edda9f2a3
++F src/os_unix.c bd7b5374a279f8fc0f0cc7d827709117e4293268
 +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
  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/printf.c 8ae1fa9d30c1200a9268a390ba9e9cea9197b27a
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
- F src/resolve.c f4d79e31ffa5820c2e3d1740baa5e9b190425f2b
+ F src/resolve.c 41aa91af56d960e9414ce1d7c17cfb68e0d1c6cb
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
- F src/select.c ca8b52422e9c525ab62304526aee4b7b15df8795
 -F src/select.c c28c52e353287434fac8473e56ee4be848d12c9d
++F src/select.c 7d05c857d13eb8fffc08e3489e1cd27513ef4b6a
  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 f0fb2d8e3b297b2a75c6b0e11defb036a04c27ff
 -F src/sqliteInt.h 107b02ed6c64162b653acc2368e982de529e14f6
++F src/sqliteInt.h 160114e383d3d47beb3e5501751a5a4a3c795cce
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c f266ad8a2892d659b74f0f50cb6a88b6e7c12179
  F src/table.c e7a09215315a978057fb42c640f890160dbcc45e
@@@ -799,10 -794,10 +799,10 @@@ F test/pcache.test 488061b5dd685df2234d
  F test/pcache2.test a83efe2dec0d392f814bfc998def1d1833942025
  F test/percentile.test 4243af26b8f3f4555abe166f723715a1f74c77ff
  F test/permutations.test f9cc1dd987986c9d4949211c7a4ed55ec9aecba1
 -F test/pragma.test ad99d05e411c7687302124be56f3b362204be041
 +F test/pragma.test 2886007790614c52f5e1489936f82a4b6be42927
  F test/pragma2.test f624a496a95ee878e81e59961eade66d5c00c028
  F test/pragma3.test 6f849ccffeee7e496d2f2b5e74152306c0b8757c
- F test/printf.test ec9870c4dce8686a37818e0bf1aba6e6a1863552
+ F test/printf.test b3ff34e73d59124140eaf89f7672e21bc2ca5fcc
  F test/printf2.test b4acd4bf8734243257f01ddefa17c4fb090acc8a
  F test/progress.test a282973d1d17f08071bc58a77d6b80f2a81c354d
  F test/ptrchng.test ef1aa72d6cf35a2bbd0869a649b744e9d84977fc
@@@ -1136,33 -1131,33 +1136,33 @@@ F test/vtabF.test fd5ad376f5a34fe0891df
  F test/vtab_alter.test 9e374885248f69e251bdaacf480b04a197f125e5
  F test/vtab_err.test 0d4d8eb4def1d053ac7c5050df3024fd47a3fbd8
  F test/vtab_shared.test ea8778d5b0df200adef2ca7c00c3c37d4375f772
 -F test/wal.test 885f32b2b390b30b4aa3dbb0e568f8f78d40f5cc
 -F test/wal2.test 1f841d2048080d32f552942e333fd99ce541dada
 -F test/wal3.test b22eb662bcbc148c5f6d956eaf94b047f7afe9c0
 -F test/wal4.test 4744e155cd6299c6bd99d3eab1c82f77db9cdb3c
 -F test/wal5.test 88b5d9a6a3d1532497ee9f4296f010d66f07e33c
 -F test/wal6.test 527581f5527bf9c24394991e2be83000aace5f9e
 +F test/wal.test 0ae504805b7e41b64a55fb5b7745de5ca2a0db2a
 +F test/wal2.test 703b87c21c1e3e169d607158de414c7c2655b93e
 +F test/wal3.test de822707fbc8e9d056edc895adfb8abcccee4590
 +F test/wal4.test 5755887f321baa4c55de0b91066fa7d0cafcac9d
 +F test/wal5.test 03043461be964ff80df96d629a7f8db1a95e1b37
 +F test/wal6.test 54ac71d59046014c70ad78957139984c5bfb7eb2
  F test/wal64k.test 163655ecd2cb8afef4737cac2a40fdd2eeaf20b8
 -F test/wal7.test 2ae8f427d240099cc4b2dfef63cff44e2a68a1bd
 -F test/wal8.test 75c42e1bc4545c277fed212f8fc9b7723cd02216
 +F test/wal7.test 18cf68ab8010ae0a2baaa48e5b59567a9503e63e
 +F test/wal8.test c35dd183708148120928dca908641c361f58062c
  F test/wal9.test 378e76a9ad09cd9bee06c172ad3547b0129a6750
 -F test/wal_common.tcl a98f17fba96206122eff624db0ab13ec377be4fe
 -F test/walbak.test b9f68e39646375c2b877be906babcc15d38b4877
 -F test/walbig.test f437473a16cfb314867c6b5d1dbcd519e73e3434
 +F test/wal_common.tcl 15f152fd55703975878741beca6cfa4209d5b3b3
 +F test/walbak.test 67339b9e54db0cdaaf21287349bc8056e2919f96
 +F test/walbig.test 3ca3d94751b80054eed5bda20a1339ae1f619483
- F test/walblock.test ffc761cd467a93ccd8cd998a23be2f21b95a83b1
+ F test/walblock.test be48f3a75eff0b4456209f26b3ce186c2015497d
 -F test/walcksum.test 9afeb96240296c08c72fc524d199c912cfe34daa
 -F test/walcrash.test 451d79e528add5c42764cea74aa2750754171b25
 -F test/walcrash2.test a0edab4e5390f03b99a790de89aad15d6ec70b36
 -F test/walcrash3.test e426aa58122d20f2b9fbe9a507f9eb8cab85b8af
 -F test/walfault.test 1f8389f7709877e9b4cc679033d71d6fe529056b
 -F test/walhook.test ed00a40ba7255da22d6b66433ab61fab16a63483
 -F test/walmode.test 4022fe03ae6e830583672caa101f046438a0473c
 -F test/walnoshm.test 84ca10c544632a756467336b7c3b864d493ee496
 -F test/walpersist.test 8c6b7e3ec1ba91b5e4dc4e0921d6d3f87cd356a6
 -F test/walro.test 34422d1d95aaff0388f0791ec20edb34e2a3ed57
 -F test/walshared.test 0befc811dcf0b287efae21612304d15576e35417
 -F test/walslow.test e7be6d9888f83aa5d3d3c7c08aa9b5c28b93609a
 -F test/walthread.test de8dbaf6d9e41481c460ba31ca61e163d7348f8e
 +F test/walcksum.test 932d12a2a36fb2765560d35e7eaa1e5f0b198385
 +F test/walcrash.test 011e05e9170da888851cb9ec4276bb1894ad32e3
 +F test/walcrash2.test 6eb6842d34cc5955726264c80566963c32a9cbea
 +F test/walcrash3.test 279640ffafa23f7564529ccd69bfb97849ccae9d
 +F test/walfault.test f4160abd02d583d06d7ea9554e7a3f749f6b3410
 +F test/walhook.test 5d2bdb04fd3e220e2f96e6b566d57e00020bdaec
 +F test/walmode.test aa45339b4afa435dde5d88e71a95459cc221a3f4
 +F test/walnoshm.test 559b878f3aab838971d820329ca35f1caa7b038e
 +F test/walpersist.test abd956d66e2f36d2d9d05d3a969f48be6d2ddbec
 +F test/walro.test 256ea9380825a34be43e8ff02bd1e240f1f62e8c
 +F test/walshared.test 04590b10c677f75318701818c50bc0dda5da64ab
 +F test/walslow.test 658066419a92d3bd85be71a11ce477af4ffe9153
 +F test/walthread.test c13f5a12fbd9d81e58f49875dc9dd8a52a84cf03
  F test/where.test 28b64e93428961b07b0d486778d63fd672948f6b
  F test/where2.test 23fdb5d8e756554aad4ca7ae03de9dd8367a2c6e
  F test/where3.test 1ad55ba900bd7747f98b6082e65bd3e442c5004e
@@@ -1253,7 -1249,10 +1254,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 4d42bf5e18485be302cf5a3f81d900d7921b4315 30011ad2f55cfcacaf23a58ebcc17b17a7b9355e
- R 49944d24f9d93632056be499ef9e2452
 -P 8e4ac2ce24415926247961b00a62425ae85d6ffb
 -R 5875861747bb686954783d9ce4259b86
 -T +bgcolor * #d0c0ff
 -T +sym-release *
 -T +sym-version-3.8.9 *
++P 71b6f507f1c5feb897b8162c468ecf2547a3d50e 8a8ffc862e96f57aa698f93de10dee28e69f6e09
++R 44db3ba6874f6ad63a13081e1a0a07f5
  U drh
- Z 990ae49055e64b21819fb2da01d2e197
 -Z 05045ab8d5dbbaefca88cc23b8dca09c
++Z 6fa29a6db82c1af802c818900a14f266

diff --cc manifest.uuid
index ce872e1a432b4c649072a39aca3e0ac65504d54e,a38b33773ef2be90729e6db5c4958c985f9f6164..28669e8d2c3450c0e9c0dc252cea374fd105d88d
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 71b6f507f1c5feb897b8162c468ecf2547a3d50e
 -8a8ffc862e96f57aa698f93de10dee28e69f6e09
++301218704cfb6eebac32828b7b2dbc6803c63a26

diff --cc src/os_unix.c
Simple merge

diff --cc src/select.c
Simple merge

diff --cc src/sqliteInt.h
Simple merge