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

FossilOrigin-Name: be62ef058bcee55b31127ee779f7ecbf762986f8

diff --cc ext/rtree/rtree.c
Simple merge

diff --cc main.mk
Simple merge

diff --cc manifest
index 81c3bc5d93d7ec0d19d1ad1da22ae026e93d42d4,368c393f8f086ceee1ebf47c499b3c6ad8cbc942..70b8ffa4b1a4cda4a4e9ae3ef904f01ef4685fa4
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,7 -1,7 +1,7 @@@
- C Simplify\sthe\sreadonly_shm\simplementation\sso\sthat\sit\sconforms\sto\sthe\nimplementation\son\strunk.\s\sUpdate\sthe\stest\scases\sto\sagree\swith\sthe\snew\nbehavior.
- D 2011-10-11T18:38:13.545
 -C Remove\sstale\srequirements\smarks\sfrom\sthe\squery\splanner.
 -D 2011-10-21T16:47:31.558
++C Merge\sthe\slatest\strunk\schanges\sinto\sthe\sapple-osx\sbranch.
++D 2011-10-21T17:18:20.228
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in a162fe39e249b8ed4a65ee947c30152786cfe897
 +F Makefile.in acb1a0b8fe8029196afe437f64ead3301731b6f0
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
  F Makefile.msc dcad80fa69f17d46fe6778ba873fc108ca16298d
  F Makefile.vxworks 1deb39c8bb047296c30161ffa10c1b5423e632f9
@@@ -84,7 -84,7 +84,7 @@@ F ext/icu/README.txt bf8461d8cdc6b8f514
  F ext/icu/icu.c eb9ae1d79046bd7871aa97ee6da51eb770134b5a
  F ext/icu/sqliteicu.h 728867a802baa5a96de7495e9689a8e01715ef37
  F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761
- F ext/rtree/rtree.c c64b78b1995fdbde9af7d2b910f8c9d9d908f583
 -F ext/rtree/rtree.c 692e9192d148f318b3dca9f744600346a175eedd
++F ext/rtree/rtree.c f1ce540925f2e25693ba396ed5935fcee95eb405
  F ext/rtree/rtree.h 834dbcb82dc85b2481cde6a07cdadfddc99e9b9e
  F ext/rtree/rtree1.test 28e1b8da4da98093ce3210187434dd760a8d89d8
  F ext/rtree/rtree2.test acbb3a4ce0f4fbc2c304d2b4b784cfa161856bba
@@@ -102,12 -102,9 +102,12 @@@ F ext/rtree/rtree_util.tcl 06aab2ed5b82
  F ext/rtree/sqlite3rtree.h 1af0899c63a688e272d69d8e746f24e76f10a3f0
  F ext/rtree/tkt3363.test 142ab96eded44a3615ec79fba98c7bde7d0f96de
  F ext/rtree/viewrtree.tcl eea6224b3553599ae665b239bd827e182b466024
 +F ext/sqlrr/README.txt 4239030e73023e72a2e727808cd433577d5bf730
 +F ext/sqlrr/sqlrr.c 8d1e6571cd6a6beabdb5bcdfe3a0e723b914db41
 +F ext/sqlrr/sqlrr.h 09e4f8929ad9bc2638732c0cc0db5eef8c417824
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
- F main.mk 8a89739e067374d14cc9a3908e16ee8e1c4a01a5
 -F main.mk ac48970ca7506c9034f5c7b2212111fbeb0a1aaa
++F main.mk 500e38ce0df2b5a13c21ccb9f224fc5b4b2c0791
  F mkdll.sh 7d09b23c05d56532e9d44a50868eb4b12ff4f74a
  F mkextu.sh 416f9b7089d80e5590a29692c9d9280a10dbad9f
  F mkextw.sh 4123480947681d9b434a5e7b1ee08135abe409ac
@@@ -124,35 -121,35 +124,35 @@@ F src/alter.c ac80a0f31189f8b4a524ebf66
  F src/analyze.c 682fd999a01c897a682365a459190758b83de836
  F src/attach.c 12c6957996908edc31c96d7c68d4942c2474405f
  F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34
- F src/backup.c 669f28886b46746e70233228231053fa8231c898
 -F src/backup.c 4368158da74d4711888e03264105c5c527d76caf
++F src/backup.c 096853864aeb7b2b8c6fc7ec346d845eac16566a
  F src/bitvec.c af50f1c8c0ff54d6bdb7a80e2fceca5a93670bef
  F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7
- F src/btree.c 2fdd62dfdb11d4c10676d23f9b8259e6bb742931
 -F src/btree.c 32199e2d939233ade25340eaba450f818b37c079
++F src/btree.c 601b808e1f1e7d0d17270f6103c5759633f5f76f
  F src/btree.h f5d775cd6cfc7ac32a2535b70e8d2af48ef5f2ce
  F src/btreeInt.h 67978c014fa4f7cc874032dd3aacadd8db656bc3
- F src/build.c 119937b0ae1ff4dcec8fdea53771acc95bafca51
+ F src/build.c ae152efb9c2d6615b14adb7a5f2c51483d4d55df
  F src/callback.c 0425c6320730e6d3981acfb9202c1bed9016ad1a
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
  F src/ctime.c 829f3261d3db48e3d87891bc887208734734c2e4
- F src/date.c a3c6842bad7ae632281811de112a8ba63ff08ab3
+ F src/date.c 067a81c9942c497aafd2c260e13add8a7d0c7dd4
  F src/delete.c ff68e5ef23aee08c0ff528f699a19397ed8bbed8
- F src/expr.c f4dcaeb8252c4b16fcdc245660f70ed366bc6cdd
+ F src/expr.c fbf116f90cabc917ae50bba24a73a0b55519a0c8
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
- F src/fkey.c 9f00ea98f6b360d477b5a78b5b59a1fbde82431c
- F src/func.c 1b9d471b632d8529e0f86b7bd2b918dcc2cb1097
+ F src/fkey.c 657212460bf5cfd3ae607d12ea62092844c227b5
 -F src/func.c 6261ce00aad9c63cd5b4219249b05683979060e9
++F src/func.c 8c5a50e75fcc974e10aad0765d215a10038abacb
  F src/global.c e230227de13601714b29f9363028514aada5ae2f
  F src/hash.c 458488dcc159c301b8e7686280ab209f1fb915af
  F src/hash.h 2894c932d84d9f892d4b4023a75e501f83050970
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
  F src/insert.c ca18783512323f74aaf4ee74b46ffd75ec80d031
  F src/journal.c 552839e54d1bf76fb8f7abe51868b66acacf6a0e
 -F src/legacy.c a199d7683d60cef73089e892409113e69c23a99f
 +F src/legacy.c 015826a958f690302d27e096a68d50b3657e4201
- F src/lempar.c 7f026423f4d71d989e719a743f98a1cbd4e6d99e
- F src/loadext.c 99a161b27a499fc8ad40745b7b1900a26f0a5f51
- F src/main.c 4aabaa8d510c08d59595be5d83c4d630e8200982
+ F src/lempar.c 0ee69fca0be54cd93939df98d2aca4ca46f44416
+ F src/loadext.c d0d2022a5a07274d408820b978b9e549189d314f
 -F src/main.c df06f5229b8046f85dde253dfd7fe35ae9e4902e
++F src/main.c d2a0879801225b8f558b40a05ee044b0c6cf6fde
  F src/malloc.c 591aedb20ae40813f1045f2ef253438a334775d9
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
 -F src/mem1.c 00bd8265c81abb665c48fea1e0c234eb3b922206
 +F src/mem1.c c390a8fce10912a770ebe6fa031f5f463649e7ae
  F src/mem2.c e307323e86b5da1853d7111b68fd6b84ad6f09cf
  F src/mem3.c 61c9d47b792908c532ca3a62b999cf21795c6534
  F src/mem5.c c2c63b7067570b00bf33d751c39af24182316f7f
@@@ -164,35 -161,34 +164,35 @@@ F src/mutex_os2.c 882d735098c07c8c6a547
  F src/mutex_unix.c b4f4e923bb8de93ec3f251fadb50855f23df9579
  F src/mutex_w32.c 5e54f3ba275bcb5d00248b8c23107df2e2f73e33
  F src/notify.c 976dd0f6171d4588e89e874fcc765e92914b6d30
- F src/os.c 0668c16ae226cd58cef8240e5edbd0c93248739e
 -F src/os.c 5d9b02782ed36345348d6fe21d7762ed3a9cfd2a
++F src/os.c c7a716e36875fb993b6e4f99cae954d504411285
  F src/os.h 9dbed8c2b9c1f2f2ebabc09e49829d4777c26bf9
  F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
  F src/os_os2.c 4a75888ba3dfc820ad5e8177025972d74d7f2440
- F src/os_unix.c cf2d13380093f2c4fa89f86c299178481776c881
- F src/os_win.c 2d6f0e6f7df4742ef4714d52f6dac2742580204e
- F src/pager.c b23e50bc7aa99e3b264537243a4f5cd2663d0734
- F src/pager.h dbcaa791e8b6c3a6b77c168c5c27deec289fb176
 -F src/os_unix.c ddda0b1c5ae536669634d7bff31b3f8f4d654866
 -F src/os_win.c 49d418916428a59d773f39993db0ecde56ab4c37
 -F src/pager.c ad62daa0c21e27ae332b3ceb4f579a2a97046ddc
++F src/os_unix.c 68ca0b5e203c7f56bfad37062ba83f94840ef015
++F src/os_win.c 4e61b811ab33d5509e0d96f758f9a9132963fff2
++F src/pager.c 52530f16c3fbaa7f73303338b4d841b857234b28
+ F src/pager.h 9f81b08efb06db4ba8be69446e10b005c351373d
  F src/parse.y 12b7ebd61ea54f0e1b1083ff69cc2c8ce9353d58
  F src/pcache.c 49e718c095810c6b3334e3a6d89970aceaddefce
  F src/pcache.h c683390d50f856d4cd8e24342ae62027d1bb6050
  F src/pcache1.c 24f5e85a78514584b46190260ba7ab0a66312197
- F src/pragma.c 273515f0297eaa96b1fef35aba284cf277a3f1c2
 -F src/pragma.c da8ef96b3eec351e81e0061c39810e548bcc96d7
 -F src/prepare.c e64261559a3187698a3e7e6c8b001a4f4f98dab4
++F src/pragma.c a09bfb67bca3d3a9292c1c85a816f4d4337a006e
 +F src/prepare.c 9d7403fe75fefa134351b41400d09ba1b189134b
- F src/printf.c 585a36b6a963df832cfb69505afa3a34ed5ef8a1
+ F src/printf.c 03104cbff6959ff45df69dc9060ba6212f60a869
  F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
- F src/resolve.c 36368f44569208fa074e61f4dd0b6c4fb60ca2b4
+ F src/resolve.c 365ab1c870e38596d6869e76fb544fe6e4ffc809
  F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
- F src/select.c f3971442d59d06801ac3c712f2851ece8d1cdead
- F src/shell.c e8fe1251aee84baa2fb232ce83d938de25aa650f
- F src/sqlite.h.in bf76418cecff032925cf68bba391ec1c6b3374b2
 -F src/select.c 80f3ac44a8514b1d107b80f5df4a424ae059d2b6
++F src/select.c 8d0e30602418d112db04c4c2d2cf20fd9580e8b9
+ F src/shell.c f0ab793261ab045a0b8c47fa2707e8a894d2898f
 -F src/sqlite.h.in c3d7085eb5f7d3b4ce7a484e0ecb9082e57daab1
++F src/sqlite.h.in 039d3179818e30759ba3bdf1edb2676ae1977539
 +F src/sqlite3_private.h e3b586e0aa329075d99be7198df9bc80c5b19e2d
  F src/sqlite3ext.h 1a1a4f784aa9c3b00edd287940197de52487cd93
- F src/sqliteInt.h 48d941b4f14ed4783257167084eea6b16cb71598
 -F src/sqliteInt.h 6f8e592fc28d16160d017684966b3528833a46c1
++F src/sqliteInt.h 4e8c351ec27343a9c69c8bf91731b91e3ad10a62
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 4568e72dfd36b6a5911f93457364deb072e0b03a
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
- F src/tclsqlite.c 20578e66dda94b4d4db3d4478644a4dd9c6084a6
+ F src/tclsqlite.c de581e2e71f5e7f98366156afad83b4742ac6fe0
 -F src/test1.c 0f41b7c67719207a5de24b009e172c4dcf189827
 +F src/test1.c 63a00ab722cc49025a6f675bcda39bed83663a48
  F src/test2.c 80d323d11e909cf0eb1b6fbb4ac22276483bcf31
  F src/test3.c 124ff9735fb6bb7d41de180d6bac90e7b1509432
  F src/test4.c d1e5a5e904d4b444cf572391fdcb017638e36ff7
@@@ -238,24 -234,24 +238,24 @@@ F src/test_wholenumber.c 6129adfbe7c744
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
  F src/tokenize.c c819d9f72168a035d545a5bdafe9b085b20df705
  F src/trigger.c 1cfb80e2290ef66ea89cb4e821caae65a02c0d56
- F src/update.c 74a6cfb34e9732c1e2a86278b229913b4b51eeec
+ F src/update.c 25e046a8f69d5e557aabde2000487b8545509d8d
  F src/utf.c 890c67dcfcc7a74623c95baac7535aadfe265e84
- F src/util.c 06302ffd2b80408d4f6c7af71f7090e0cf8d8ff7
+ F src/util.c df83983bd57057df4951516880066b42b7055269
  F src/vacuum.c 0c0ba2242355c6048d65e2b333abe0f7c06348fa
- F src/vdbe.c 26deb38f5bd32ebeb2cb60853a52f2bf33d71641
 -F src/vdbe.c 251381bff459154bf239e9977bd39b22bcb7a94c
++F src/vdbe.c 2ed980c8b2e560ab0e50bdcaa8f3333c4dd763ae
  F src/vdbe.h f0725ee997db869ecae5bb70a71612aabeca7755
  F src/vdbeInt.h 693d6ac6810298fc6b4c503cfbe3f99a240f40af
 -F src/vdbeapi.c 11dc47987abacb76ad016dcf5abc0dc422482a98
 -F src/vdbeaux.c 5bd4886b444051b779eb4a2e27e46a5deb65c0fd
 +F src/vdbeapi.c 335435e65443f38d3073b5043e80cbbb7090c2d9
- F src/vdbeaux.c 1387589c8bf9811d3a2824b5c5cd60e3d0e9a70b
++F src/vdbeaux.c a76f50a538fb9c6e90d8648fbdb154179f58bad6
  F src/vdbeblob.c 32f2a4899d67f69634ea4dd93e3f651936d732cb
  F src/vdbemem.c 2fc78b3e0fabcc1eaa23cd79dd2e30e6dcfe1e56
  F src/vdbesort.c 468d43c057063e54da4f1988b38b4f46d60e7790
 -F src/vdbetrace.c 5d0dc3d5fd54878cc8d6d28eb41deb8d5885b114
 +F src/vdbetrace.c 4b92fe7355f682368203d29b2be7125cbab85e79
  F src/vtab.c 901791a47318c0562cd0c676a2c6ff1bc530e582
- F src/wal.c eea77c324942f7e31ce9c3a5e6e86c4a0424fa09
 -F src/wal.c 9658df8d404b82e6b2d40fd05944463214e2d935
 -F src/wal.h 66b40bd91bc29a5be1c88ddd1f5ade8f3f48728a
++F src/wal.c ae9272089ec7bd1b5dba6eeb6909ff018e40632e
 +F src/wal.h e75d87752bd5df3dc4152ee2cb3b0dcd0b309e5e
  F src/walker.c 3112bb3afe1d85dc52317cb1d752055e9a781f8f
- F src/where.c 12939ac49f5122eb11b5ca4c35b2fdd8eaae9833
+ F src/where.c 922145a39cf91a5dbb83bbc54f0e316f52023fa2
  F test/8_3_names.test 631ea964a3edb091cf73c3b540f6bcfdb36ce823
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
  F test/alias.test 4529fbc152f190268a15f9384a5651bbbabc9d87
@@@ -605,10 -603,10 +608,10 @@@ F test/misc5.test 528468b26d03303b1f047
  F test/misc6.test 953cc693924d88e6117aeba16f46f0bf5abede91
  F test/misc7.test eafaa41b9133d7a2ded4641bbe5f340731d35a52
  F test/misuse.test ba4fb5d1a6101d1c171ea38b3c613d0661c83054
 -F test/multiplex.test 9df8bf738b3b97c718fceb3fadb30900ba494418
 +F test/multiplex.test 6771925b61c19fdbdb4739c1ef2a279c48b48a75
  F test/mutex1.test 78b2b9bb320e51d156c4efdb71b99b051e7a4b41
  F test/mutex2.test bfeaeac2e73095b2ac32285d2756e3a65e681660
- F test/nan.test dc212a22b36109fd1ae37154292444ef249c5ec2
+ F test/nan.test e9648b9d007c7045242af35e11a984d4b169443a
  F test/notify1.test 669b2b743618efdc18ca4b02f45423d5d2304abf
  F test/notify2.test 9503e51b9a272a5405c205ad61b7623d5a9ca489
  F test/notify3.test a86259abbfb923aa27d30f0fc038c88e5251488a
@@@ -626,10 -624,10 +629,10 @@@ F test/pageropt.test 9191867ed19a2b3db6
  F test/pagesize.test 1dd51367e752e742f58e861e65ed7390603827a0
  F test/pcache.test 065aa286e722ab24f2e51792c1f093bf60656b16
  F test/pcache2.test a83efe2dec0d392f814bfc998def1d1833942025
- F test/permutations.test ad17319066a90e2db71823c3ff104795ffc71b31
- F test/pragma.test 68f2a9a4ac4cb8f198947c18905377002c88a6aa
+ F test/permutations.test 522823b47238cb1754198f80817fe9f9158ede55
 -F test/pragma.test 1ea0c85be853135bb7468e6eed48ee12b04794d4
++F test/pragma.test 86344e113584d7156a6e3a1a2e168293629b3ba3
  F test/pragma2.test 3a55f82b954242c642f8342b17dffc8b47472947
- F test/printf.test 05970cde31b1a9f54bd75af60597be75a5c54fea
+ F test/printf.test ec9870c4dce8686a37818e0bf1aba6e6a1863552
  F test/progress.test 5b075c3c790c7b2a61419bc199db87aaf48b8301
  F test/ptrchng.test ef1aa72d6cf35a2bbd0869a649b744e9d84977fc
  F test/quick.test 1681febc928d686362d50057c642f77a02c62e57
@@@ -911,12 -910,12 +915,12 @@@ F test/walmode.test 9308ffc25555a1c4eaa
  F test/walnoshm.test 84ca10c544632a756467336b7c3b864d493ee496
  F test/walpersist.test fd40d33765b2693f721c90c66d97f99757559006
  F test/walro.test e6bb27762c9f22601cbb8bff6e0acfd124e74b63
 -F test/walshared.test 6dda2293880c300baf5d791c307f653094585761
 -F test/walslow.test e7be6d9888f83aa5d3d3c7c08aa9b5c28b93609a
 -F test/walthread.test a2ed5270eb695284d4ad27d252517bdc3317ee2a
 +F test/walshared.test 0befc811dcf0b287efae21612304d15576e35417
 +F test/walslow.test 3c2475d7672511380d33cef1924a065d2ad62ff0
 +F test/walthread.test 3decc7e72594e0270dc1a1cc0984d6db7165b4cc
  F test/where.test de337a3fe0a459ec7c93db16a519657a90552330
  F test/where2.test 43d4becaf5a5df854e6c21d624a1cb84c6904554
- F test/where3.test 8e1175c7ef710c70502858fc4fb08d784b3620b9
+ F test/where3.test 667e75642102c97a00bf9b23d3cb267db321d006
  F test/where4.test e9b9e2f2f98f00379e6031db6a6fca29bae782a2
  F test/where5.test fdf66f96d29a064b63eb543e28da4dfdccd81ad2
  F test/where6.test 5da5a98cec820d488e82708301b96cb8c18a258b
@@@ -967,11 -966,13 +971,13 @@@ F tool/speedtest2.tcl ee2149167303ba8e9
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c
- F tool/symbols.sh caaf6ccc7300fd43353318b44524853e222557d5
+ F tool/symbols-mingw.sh 4dbcea7e74768305384c9fd2ed2b41bbf9f0414d
+ F tool/symbols.sh fec58532668296d7c7dc48be9c87f75ccdb5814f
  F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
+ F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
- P cce1f521362a87cc46fc5bfba68b7c188e2ea34f
- R 6248c52db8063a12ed87719b7770c516
 -P 07159e84b40b01fa40cac5fad1f433888e5984f8
 -R 59b3b1fdd8178d0f82d2b752104b93d8
++P 9efb74cefb2b7444112e16f3da48d5645746fdfa 76de9914bed11abda3898928633ad09d5a284f84
++R ff59b75f665561c9ffd57ff590889162
  U drh
- Z d5d2cbe7994f9774b3181fd3344ad8bf
 -Z 3d414bcbeacde088fb044f861f268a3d
++Z 7e41e2920fb5c9764f219e8a7543321b

diff --cc manifest.uuid
index 8300a3850baeed9d321287a6ceda691432f14e88,f4d78eed3e799b665bf61c84b58576fa43ec517c..2110f71e26edb17162d71dc8a14a40c5069386ce
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 9efb74cefb2b7444112e16f3da48d5645746fdfa
 -76de9914bed11abda3898928633ad09d5a284f84
++be62ef058bcee55b31127ee779f7ecbf762986f8

diff --cc src/backup.c
Simple merge

diff --cc src/btree.c
Simple merge

diff --cc src/func.c
Simple merge

diff --cc src/main.c
Simple merge

diff --cc src/os.c
Simple merge

diff --cc src/os_unix.c
index 5e778f144ae2fd48155dff4ec79ce04452170c1c,0ea6daf27fe0613cff67fcc3186f8e3b1e4e5b4a..feb73e254783c3f985013d41ec19fc63445e713a
--- 1/src/os_unix.c
--- 2/src/os_unix.c
+++ b/src/os_unix.c
@@@ -2048,22 -1700,11 +2038,19 @@@ static int posixUnlock(sqlite3_file *id
        lock.l_type = F_UNLCK;
        lock.l_whence = SEEK_SET;
        lock.l_start = lock.l_len = 0L;
-       SimulateIOErrorBenign(1);
-       SimulateIOError( h=(-1) )
-       SimulateIOErrorBenign(0);
 -      if( unixFileLock(pFile, &lock)==0 ){
 +      if( unixFileLock(pFile, &lock, 10)==0 ){
          pInode->eFileLock = NO_LOCK;
        }else{
 +#if OSLOCKING_CHECK_BUSY_IOERR
 +        tErrno = errno;
 +        rc = sqliteErrorFromPosixError(tErrno, SQLITE_IOERR_UNLOCK);
 +        if( IS_LOCK_ERROR(rc) ){
 +          pFile->lastErrno = tErrno;
 +        }
 +#else
          rc = SQLITE_IOERR_UNLOCK;
 -      pFile->lastErrno = errno;
 +          pFile->lastErrno = errno;
 +#endif
          pInode->eFileLock = NO_LOCK;
          pFile->eFileLock = NO_LOCK;
        }

diff --cc src/os_win.c
Simple merge

diff --cc src/pager.c
Simple merge

diff --cc src/pragma.c
Simple merge

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

diff --cc src/vdbeaux.c
Simple merge

diff --cc src/wal.c
Simple merge

diff --cc test/pragma.test
Simple merge