Merge all recent trunk enhancements and especially the blocking WAL-lock fix

into the apple-osx branch.

FossilOrigin-Name: 9f1f8b331e05d88052e6fb6556a88591efaa44bf

diff --cc manifest
index f6aedaa8c96a01ad7c04364e00dd5b89d5faaf1f,227d2396bfe70c968d8a8c37cbb0e090d90b140d..607564531b996af7b0032767d18092607bf1d0ff
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Merge\sall\srecent\strunk\schanges,\sand\sin\sparticular\sthe\sblocking\sWAL\slock\schange,\ninto\sthe\sapple-osx\sbranch.
- D 2015-03-17T18:35:40.658
 -C Change\swalblock.test\sto\sblock\san\sexternal\sprocess\sfor\s10\sseconds,\snot\s5.\s5\sseconds\sis\snot\slong\senough\sto\stell\sthe\sdifference\sbetween\sa\sblocking\slock\sand\sa\sseries\sof\sretries.
 -D 2015-03-21T16:40:24.176
++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
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in 88a3e6261286db378fdffa1124cad11b3c05f5bb
 +F Makefile.in e1da335f215ba86fe687f4d963a45156f3da603e
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc 529e61cd9d29a3934758b4b3a0bb649b6c653481
+ F Makefile.msc cd626b52ebeec0e2c0dd929243bdd25b0df19a71
  F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
  F README.md d58e3bebc0a4145e0f2a87994015fdb575a8e866
  F VERSION 319eb1ced4b4d17a67730f2b7b85f15c1346cb60
@@@ -175,11 -172,11 +175,11 @@@ F src/attach.c 880f9b8641a829c563e52dd1
  F src/auth.c b56c78ebe40a2110fd361379f7e8162d23f92240
  F src/backup.c ff743689c4d6c5cb55ad42ed9d174b2b3e71f1e3
  F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb
- F src/btmutex.c 49ca66250c7dfa844a4d4cb8272b87420d27d3a5
- F src/btree.c 7f5174c0744a265f3ecd8dd8bc27f439e6de34b3
- F src/btree.h 9cbbb92aab22ef8b50493c40aa3f8de87c43a2fb
+ F src/btmutex.c 45a968cc85afed9b5e6cf55bf1f42f8d18107f79
 -F src/btree.c d4d52fb14e863cff9dbc7c746e9048ec0967a555
++F src/btree.c 22086fbd6843dda1e424fb63a1d40bc6df35f5a6
+ F src/btree.h 969adc948e89e449220ff0ff724c94bb2a52e9f1
  F src/btreeInt.h 2bfefc01875d8da066504c233ec259fcb3b2ef72
- F src/build.c ba45ebd02904e84d98839a6ea74c3eb948596587
+ F src/build.c 0419bba592c22f6d00e6d57a2ca7136720d02c1a
  F src/callback.c 7b44ce59674338ad48b0e84e7b72f935ea4f68b0
  F src/complete.c 198a0066ba60ab06fc00fba1998d870a4d575463
  F src/ctime.c 98f89724adc891a1a4c655bee04e33e716e05887
@@@ -217,12 -214,12 +217,12 @@@ 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 78819ac326afb72cae2fe9ad184ccf53cf62b6e0
 -F src/os_unix.c e68c8e77e47ce38865ebf8e1a0e877ac955f469c
 -F src/os_win.c 8223e7db5b7c4a81d8b161098ac3959400434cdb
++F src/os_unix.c 181f73696df260983977e4008dd0f6be5952493f
 +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 0f8e7d60f0ab3cb53d270adef69259ac307d83a8
+ F src/parse.y 1299c66e7b1707322ccd8af43a359b8fb0d46d72
  F src/pcache.c 10539fb959849ad6efff80050541cab3d25089d4
  F src/pcache.h b44658c9c932d203510279439d891a2a83e12ba8
  F src/pcache1.c 1e77432b40b7d3288327d9cdf399dcdfd2b6d3bf
@@@ -233,13 -230,12 +233,13 @@@ F src/printf.c 8da9a2687a396daa19860f4d
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
  F src/resolve.c f4d79e31ffa5820c2e3d1740baa5e9b190425f2b
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
- F src/select.c b85b02f47a5cda5e59d0ee320fd1d953bfc3599e
- F src/shell.c cce82ca26392578a4a1ee927dfe55ea3411c7c92
- F src/sqlite.h.in d5d56df4ce88bcc0423509963726c402dec7b0df
 -F src/select.c 72ffb62e2879956302140e9f6e6ae88aee36b0e5
++F src/select.c ca8b52422e9c525ab62304526aee4b7b15df8795
+ F src/shell.c 9c1589c8271c04c02d23cdbc2c07bb40752fa9eb
 -F src/sqlite.h.in c7c9111477b76c82c46bf851b619df4dd35cc095
++F src/sqlite.h.in 2f47537efda60acd8a6232433a5e1401308b3bd6
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
 +F src/sqlite3_private.h a81a9c5f97c095cc3e86914a05f8fabe0011f4a1
  F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d
- F src/sqliteInt.h f54cc2f5c91b939d3183e9b30d4e0f89f69eb16d
 -F src/sqliteInt.h f2300529f3592323a98fd7acccec63d0e9082dc5
++F src/sqliteInt.h 70be3eae583a7d24bbb9a86572f813e58bd4883f
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c 81712116e826b0089bb221b018929536b2b5406f
  F src/table.c e7a09215315a978057fb42c640f890160dbcc45e
@@@ -297,23 -293,23 +297,23 @@@ F src/update.c 3c4ecc282accf12d39edb8d5
  F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
  F src/util.c 98a7627ca48ad3265b6940915a1d08355eb3fc7e
  F src/vacuum.c 9460b9de7b2d4e34b0d374894aa6c8a0632be8ec
- F src/vdbe.c 61acaf6b951f3c505c7ab2693dd72d4a8a4a488e
 -F src/vdbe.c bd793ed436edccaf264ec969ac92c9b5f4b41d64
++F src/vdbe.c 9ece90dfaae797b5ea2caf55e5741375d2393ed5
  F src/vdbe.h 6fc69d9c5e146302c56e163cb4b31d1ee64a18c3
  F src/vdbeInt.h bb56fd199d8af1a2c1b9639ee2f70724b4338e3a
 -F src/vdbeapi.c 583d56b129dd27f12bed518270de9ebe521e6a75
 -F src/vdbeaux.c 23390670e64f011f3fed8f38a2f25aaccacb74d2
 +F src/vdbeapi.c 36861a49fcb11325e2fce937418b06ce1e3de1a8
 +F src/vdbeaux.c 22b3068248279493a493fec70752ccbbca1f792c
  F src/vdbeblob.c 4f2e8e075d238392df98c5e03a64342465b03f90
  F src/vdbemem.c c0dc81285b7571b0a31c40f17846fe2397ec1cd9
- F src/vdbesort.c 6d64c5448b64851b99931ede980addc3af70d5e2
+ F src/vdbesort.c 919717d7599fa31d343ec28bffd0f9e91a4ff5f6
  F src/vdbetrace.c 7e4222955e07dd707a2f360c0eb73452be1cb010
- F src/vtab.c 699f2b8d509cfe379c33dde33827875d5b030e01
+ F src/vtab.c 1680f58978ae014a331d99b4c87316d079056c5e
  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 42ce3fd5ec9fe050f623be358cfddee01c1f6286
+ F src/where.c 85d832efa5ef57de542db7f430b72fecd3af8b38
  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
@@@ -1134,33 -1129,33 +1134,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 f1290524714232c109fb0b14db28f14d81c3ddd0
+ F test/walblock.test ffc761cd467a93ccd8cd998a23be2f21b95a83b1
 -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
@@@ -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 5e04eec88e4f5cb9d57577ee2d9e3569de930fbb 7214dab7443d35c105904dd69635c1f8b45b2fc8
- R 01c2835cb7081d0ecda0584d4b9457cf
 -P 67d69d21de32816894be53e4b446656d4174eb0d
 -R fd1744ba13eb7ca730963f1f28c9bbe1
 -U dan
 -Z 766817d70f1d0d42f94e17731574ace5
++P 8abbeadbc028524c4a59c1af6c10f724ccb91d0a 717335fcdb15430ed977cbc98d30345b71728b66
++R 775b3d9be861b08d397e30b210180725
 +U drh
- Z 06d231ac3a608b2888a809dfdfa1fc87
++Z a3a4f891a9dbb662947b3c944b175f66

diff --cc manifest.uuid
index 8663a2fe3a1255ccfa6705170aa0793f97125aee,183e639eed32e3e0297c20aaa49d1981a5e34d03..cc7dabb15bf0fdd6ad150c4472a9110a45ca953b
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 8abbeadbc028524c4a59c1af6c10f724ccb91d0a
 -717335fcdb15430ed977cbc98d30345b71728b66
++9f1f8b331e05d88052e6fb6556a88591efaa44bf

diff --cc src/btree.c
Simple merge

diff --cc src/os_unix.c
index 8ae767aa302c8cfb727e5dd8ce92746bf99073ee,d0924a511b165826147f039d9de654f9e6e1f657..a6fcfe04202129d564a2c02a9c709565f13b2629
--- 1/src/os_unix.c
--- 2/src/os_unix.c
+++ b/src/os_unix.c
@@@ -8478,13 -7232,9 +8482,9 @@@ static int proxyTransformUnixFile(unixF
  */
  static int proxyFileControl(sqlite3_file *id, int op, void *pArg){
    switch( op ){
-     case SQLITE_FCNTL_WAL_BLOCK: {
-       id->ctrlFlags |= UNIXFILE_BLOCK;
-       return SQLITE_OK;
-     }
      case SQLITE_FCNTL_GET_LOCKPROXYFILE: {
        unixFile *pFile = (unixFile*)id;
 -      if( pFile->pMethod == &proxyIoMethods ){
 +      if( isProxyLockingMode(pFile) ){
          proxyLockingContext *pCtx = (proxyLockingContext*)pFile->lockingContext;
          proxyTakeConch(pFile);
          if( pCtx->lockProxyPath ){

diff --cc src/select.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