Merge all recent trunk changes, and in particular the blocking WAL lock change,

into the apple-osx branch.

FossilOrigin-Name: 8abbeadbc028524c4a59c1af6c10f724ccb91d0a

diff --cc Makefile.in
Simple merge

diff --cc manifest
index d202cfd721846fd11d51f75a63a7cd695286b004,47a6aa6b9918c073fe15369cd36c134ee3545229..f6aedaa8c96a01ad7c04364e00dd5b89d5faaf1f
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,7 -1,7 +1,7 @@@
- C Merge\srecent\strunk\senhancements\sinto\sthe\sapple-osx\sbranch.
- D 2015-03-09T13:18:22.512
 -C Also\smerge\sthe\sWAL\sblocking\slock\stests\sthat\swere\ssomehow\smissed\son\sthe\nprevious\scheck-in.
 -D 2015-03-17T17:08:35.872
++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
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in 34f555a2492a7dd64f44eeb9aa6277b6d65e2364
 -F Makefile.in 88a3e6261286db378fdffa1124cad11b3c05f5bb
++F Makefile.in e1da335f215ba86fe687f4d963a45156f3da603e
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
  F Makefile.msc 529e61cd9d29a3934758b4b3a0bb649b6c653481
  F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
@@@ -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 e34ae6ec878f69ea6d3394f8b105a22cd75f7043
 -F src/os_unix.c cc903ecc6ebda90ef703d043ddaa7f33de0cab0f
 -F src/os_win.c 8223e7db5b7c4a81d8b161098ac3959400434cdb
++F src/os_unix.c 78819ac326afb72cae2fe9ad184ccf53cf62b6e0
 +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/pcache.c 10539fb959849ad6efff80050541cab3d25089d4
  F src/pcache.h b44658c9c932d203510279439d891a2a83e12ba8
@@@ -233,18 -230,17 +233,18 @@@ F src/printf.c 8da9a2687a396daa19860f4d
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
  F src/resolve.c f4d79e31ffa5820c2e3d1740baa5e9b190425f2b
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
 -F src/select.c 94e016b6733b1d39a2f4c8d431155b4c2897d907
 +F src/select.c b85b02f47a5cda5e59d0ee320fd1d953bfc3599e
  F src/shell.c cce82ca26392578a4a1ee927dfe55ea3411c7c92
- F src/sqlite.h.in 96d3cf409aeb646d7ba8bdd2dc09ab30db79ef68
 -F src/sqlite.h.in ce547ac4df17e8d996679f7a385911b3a0c52d48
++F src/sqlite.h.in d5d56df4ce88bcc0423509963726c402dec7b0df
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
 +F src/sqlite3_private.h a81a9c5f97c095cc3e86914a05f8fabe0011f4a1
  F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d
 -F src/sqliteInt.h fae682c2b4dfbe489b134d74521c41c088f16ab1
 +F src/sqliteInt.h f54cc2f5c91b939d3183e9b30d4e0f89f69eb16d
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c 81712116e826b0089bb221b018929536b2b5406f
  F src/table.c e7a09215315a978057fb42c640f890160dbcc45e
- F src/tclsqlite.c b290774586f022e16e04ba8ed2f0b8edd86b5b77
+ 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,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 b817ad546e2d187ac20536d4cb2f35d9c020d893
 -F src/vdbe.c a2725107658fd9572637e8e09d46dcfe851edb96
++F src/vdbe.c 61acaf6b951f3c505c7ab2693dd72d4a8a4a488e
  F src/vdbe.h 6fc69d9c5e146302c56e163cb4b31d1ee64a18c3
  F src/vdbeInt.h bb56fd199d8af1a2c1b9639ee2f70724b4338e3a
- F src/vdbeapi.c 6ef15e2dc26f28bf59b6a00819d432d304ee8005
- F src/vdbeaux.c 7069b951a45fb7eafed15bd358ae2f35356f33ad
 -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 31d8eabb0cd78bfeab4e5124c7363c3e9e54db9f
+ F src/vdbemem.c c0dc81285b7571b0a31c40f17846fe2397ec1cd9
  F src/vdbesort.c 6d64c5448b64851b99931ede980addc3af70d5e2
  F src/vdbetrace.c 7e4222955e07dd707a2f360c0eb73452be1cb010
  F src/vtab.c 699f2b8d509cfe379c33dde33827875d5b030e01
  F src/vxworks.h c18586c8edc1bddbc15c004fa16aeb1e1342b4fb
- F src/wal.c 61a28dad1a098848a09702a938d515edde5c5a09
 -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 eb141b075776e9864d38f279333e2472a8653202
+ F src/where.c 42ce3fd5ec9fe050f623be358cfddee01c1f6286
  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
@@@ -643,13 -641,14 +645,14 @@@ F test/in3.test 3cbf58c87f4052cee3a58b3
  F test/in4.test d2b38cba404bc4320f4fe1b595b3d163f212c068
  F test/in5.test 1de657472fa9ac2924be25c2c959ac5ca1aae554
  F test/incrblob.test e81846d214f3637622620fbde7cd526781cfe328
- F test/incrblob2.test 0d8821730a84f90af78a9dd547fe7a2480a06240
+ F test/incrblob2.test a5ce5ed1d0b01e2ed347245a21170372528af0a5
 -F test/incrblob3.test d8d036fde015d4a159cd3cbae9d29003b37227a4
 +F test/incrblob3.test 5fa6f2665ae37da05928bb16851d4f86515af78a
  F test/incrblob4.test f26502a5697893e5acea268c910f16478c2f0fab
  F test/incrblob_err.test af1f12ba60d220c9752073ff2bda2ad59e88960d
  F test/incrblobfault.test 280474078f6da9e732cd2a215d3d854969014b6e
+ F test/incrcorrupt.test 9786cba68c5832f01887fde1c06b43c3904d86f6
  F test/incrvacuum.test d2a6ddf5e429720b5fe502766af747915ccf6c32
 -F test/incrvacuum2.test 676c41428765d58f1da7dbe659ef27726d3d30ac
 +F test/incrvacuum2.test a1828b6165af6c248c4eb80aeaee2bcbb45768c1
  F test/incrvacuum3.test 75256fb1377e7c39ef2de62bfc42bbff67be295a
  F test/incrvacuum_ioerr.test 6ae2f783424e47a0033304808fe27789cf93e635
  F test/index.test 4d990005a67a36984e4f1a5f1bdccea8d08da4ee
@@@ -703,13 -702,12 +706,13 @@@ F test/lock.test b984ab9034e7389be0d863
  F test/lock2.test 5242d8ac4e2d59c403aebff606af449b455aceff
  F test/lock3.test f271375930711ae044080f4fe6d6eda930870d00
  F test/lock4.test e175ae13865bc87680607563bafba21f31a26f12
 -F test/lock5.test c6c5e0ebcb21c61a572870cc86c0cb9f14cede38
 -F test/lock6.test ad5b387a3a8096afd3c68a55b9535056431b0cf5
 +F test/lock5.test 1f1e0fd1670deef8c0a76e8f895bd5e124133ca4
 +F test/lock6.test 83434ae8ca1d1c5e2eaf74d4e44aa24ab62b291c
  F test/lock7.test 49f1eaff1cdc491cc5dee3669f3c671d9f172431
- F test/lock_common.tcl 0c270b121d40959fa2f3add382200c27045b3d95
+ F test/lock_common.tcl 7ffb45accf6ee91c736df9bafe0806a44358f035
 +F test/lock_proxy.test 95be9c32d79be25cf643b4e41a0aa0e53aa21621
  F test/lookaside.test 93f07bac140c5bb1d49f3892d2684decafdc7af2
 -F test/main.test 16131264ea0c2b93b95201f0c92958e85f2ba11a
 +F test/main.test 3595944ab7fbb3637a499d3eff2b60c89e26adbb
  F test/make-where7.tcl 05c16b5d4f5d6512881dfec560cb793915932ef9
  F test/malloc.test 96939d2d1a6f39667bbebe5bc27c6525f2ab614e
  F test/malloc3.test e3b32c724b5a124b57cb0ed177f675249ad0c66a
@@@ -730,14 -728,14 +733,14 @@@ F test/mallocG.test 0ff91b65c50bdaba680
  F test/mallocH.test 79b65aed612c9b3ed2dcdaa727c85895fd1bfbdb
  F test/mallocI.test a88c2b9627c8506bf4703d8397420043a786cdb6
  F test/mallocJ.test b5d1839da331d96223e5f458856f8ffe1366f62e
- F test/mallocK.test 223cc80c870c80d4a9c2014e94133efdf0123f82
+ F test/mallocK.test da01dcdd316767b8356741f8d33a23a06a23def5
  F test/mallocL.test 252ddc7eb4fbf75364eab17b938816085ff1fc17
 -F test/malloc_common.tcl 3663f9001ce3e29bbaa9677ffe15cd468e3ec7e3
 -F test/manydb.test 28385ae2087967aa05c38624cec7d96ec74feb3e
 +F test/malloc_common.tcl c34d5b7f337336a7f2e30a197f1cf2646dbe8e76
 +F test/manydb.test 3cd8e52ab3112cb8365afeedd6e8231977920577
  F test/mem5.test c6460fba403c5703141348cd90de1c294188c68f
 -F test/memdb.test fcb5297b321b562084fc79d64d5a12a1cd2b639b
 +F test/memdb.test da09b7f354f3dc0b74d992f5451ae03ebfb36920
  F test/memleak.test 10b9c6c57e19fc68c32941495e9ba1c50123f6e2
 -F test/memsubsys1.test 690d142525a7d31efb638b0d232e25fac3afeb1a
 +F test/memsubsys1.test ab9e5d4268f19d08ee06fdd9b3b5c678083224e7
  F test/memsubsys2.test 3a1c1a9de48e5726faa85108b02459fae8cb9ee9
  F test/minmax.test 42fbad0e81afaa6e0de41c960329f2b2c3526efd
  F test/minmax2.test b44bae787fc7b227597b01b0ca5575c7cb54d3bc
@@@ -911,11 -909,11 +914,11 @@@ F test/sysfault.test fa776e60bf46bdd3ae
  F test/table.test 06271d61eb13871490d38168433c1ef3dd82bb2a
  F test/tableapi.test 2674633fa95d80da917571ebdd759a14d9819126
  F test/tableopts.test dba698ba97251017b7c80d738c198d39ab747930
- F test/tclsqlite.test 37a61c2da7e3bfe3b8c1a2867199f6b860df5d43
+ F test/tclsqlite.test 7fb866443c7deceed22b63948ccd6f76b52ad054
 -F test/tempdb.test 19d0f66e2e3eeffd68661a11c83ba5e6ace9128c
 +F test/tempdb.test 3263e5c3f0604e54d307481e8587327c54544d18
  F test/temptable.test d2c9b87a54147161bcd1822e30c1d1cd891e5b30
  F test/temptrigger.test 8ec228b0db5d7ebc4ee9b458fc28cb9e7873f5e1
 -F test/tester.tcl ed77454e6c7b40eb501db7e79d1c6fbfd3eebbff
 +F test/tester.tcl a173ad0b6bedc17b5f0445af9ff302bff4885ced
  F test/thread001.test 9f22fd3525a307ff42a326b6bc7b0465be1745a5
  F test/thread002.test e630504f8a06c00bf8bbe68528774dd96aeb2e58
  F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7
@@@ -1131,32 -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/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
@@@ -1246,7 -1246,8 +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 ba8294e2f76a0cfcf48200634e6076a8995024f0 984c3fd5261619fb542a5a95dab37707b5d79dbf
- R 1e0c78d4cacbb02fa90879347a2ff3d1
 -P ec2f46de531ec8ef91981b19b48ab64db7727264 e22dde187eb0b389d6d93e2e39a26fd0f4e6196e
 -R 35d1aacb5b2efba4948b8dccdeab808c
 -T +closed e22dde187eb0b389d6d93e2e39a26fd0f4e6196e
++P 5e04eec88e4f5cb9d57577ee2d9e3569de930fbb 7214dab7443d35c105904dd69635c1f8b45b2fc8
++R 01c2835cb7081d0ecda0584d4b9457cf
  U drh
- Z 9d1689cb5b0a1a7d1bebe577ddd9509c
 -Z 7357efe8421db7654a103c304e504696
++Z 06d231ac3a608b2888a809dfdfa1fc87

diff --cc manifest.uuid
index 405162b2a8c527816cac0f6b9eace27871dbeb51,f8ce2770f13fb815f98b88adda82f24ddd032bd6..8663a2fe3a1255ccfa6705170aa0793f97125aee
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 5e04eec88e4f5cb9d57577ee2d9e3569de930fbb
 -7214dab7443d35c105904dd69635c1f8b45b2fc8
++8abbeadbc028524c4a59c1af6c10f724ccb91d0a

diff --cc src/os_unix.c
index c28943d03bf5e4890d93077a4945ae21b702a95e,16cb935decf587d1a2913b365b00400d1c56d352..8ae767aa302c8cfb727e5dd8ce92746bf99073ee
--- 1/src/os_unix.c
--- 2/src/os_unix.c
+++ b/src/os_unix.c
@@@ -5072,18 -4332,9 +5078,18 @@@ static int unixOpenSharedMemory(unixFil
        ** If not, truncate the file to zero length. 
        */
        rc = SQLITE_OK;
-       if( unixShmSystemLock(pShmNode, F_WRLCK, UNIX_SHM_DMS, 1)==SQLITE_OK ){
+       if( unixShmSystemLock(pDbFd, F_WRLCK, UNIX_SHM_DMS, 1)==SQLITE_OK ){
          if( robust_ftruncate(pShmNode->h, 0) ){
            rc = unixLogError(SQLITE_IOERR_SHMOPEN, "ftruncate", zShmFilename);
 +        }else{
 +          /* If running as root set the uid/gid of the shm file to match
 +          ** the database */
 +          uid_t euid = geteuid();
 +          if( (!pShmNode->isReadonly) && euid==0 && (euid!=sStat.st_uid || getegid()!=sStat.st_gid) ){
 +            if( osFchown(pShmNode->h, sStat.st_uid, sStat.st_gid) ){
 +              rc = SQLITE_IOERR_SHMOPEN;
 +            }
 +          }
          }
        }
        if( rc==SQLITE_OK ){
@@@ -8472,9 -7228,13 +8478,13 @@@ 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/sqlite.h.in
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc src/vdbeapi.c
Simple merge

diff --cc src/vdbeaux.c
Simple merge

diff --cc src/wal.c
Simple merge