Merge in changes from the trunk.

FossilOrigin-Name: 76bf0eee1fd4003a3f1c39922f8f059611d41dd0

diff --cc manifest
index 5325f9307663e432fc928351c5758537a7c1f08c,54756b342fb7f2dcebb27ed1226b3574f2a320fa..8bd0968857a4cd987b631901d00e55f3438a13d1
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,10 -1,10 +1,10 @@@
  -----BEGIN PGP SIGNED MESSAGE-----
  Hash: SHA1
  
- C Change\sthe\sSHM\sVFS\slogic\sin\sos_unix.c\sso\sthat\sit\sdoes\snot\shold\san\sexclusive\nlock\sn\sthe\smapped\smemory\swhen\salso\sholding\sa\sCHECKPOINT\slock.\s\sThis\nimproves\sconcurrency\sbetween\sreaders\sand\scheckpointers.
- D 2010-04-30T17:47:51
 -C Avoid\sassertion\sfaults\sin\squeries\susing\sindices\swith\sredundant\scolumns.\nTicket\s[3dbdcdb14e7f41].
 -D 2010-04-30T21:03:24
++C Merge\sin\schanges\sfrom\sthe\strunk.
++D 2010-04-30T22:28:06
  F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 -F Makefile.in 4f2f967b7e58a35bb74fb7ec8ae90e0f4ca7868b
 +F Makefile.in d83a0ffef3dcbfb08b410a6c6dd6c009ec9167fb
  F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
  F Makefile.vxworks ab005d301296c40e021ccd0133ce49ca811e319f
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
@@@ -224,10 -224,8 +224,10 @@@ F src/vdbeblob.c 5327132a42a91e8b7acfb6
  F src/vdbemem.c 2a82f455f6ca6f78b59fb312f96054c04ae0ead1
  F src/vdbetrace.c 864cef96919323482ebd9986f2132435115e9cc2
  F src/vtab.c a0f8a40274e4261696ef57aa806de2776ab72cda
 +F src/wal.c 2115a90d42e1cc14c0f196677609f6c9b32afec7
 +F src/wal.h c3f347ba8f1cde46d9bcc6fedaf3ed0aa4b53294
  F src/walker.c 3112bb3afe1d85dc52317cb1d752055e9a781f8f
- F src/where.c faadd9c2bf08868e5135192b44e0d753e363a885
+ F src/where.c 75fee9e255b62f773fcadd1d1f25b6f63ac7a356
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
  F test/alias.test 4529fbc152f190268a15f9384a5651bbbabc9d87
  F test/all.test 14165b3e32715b700b5f0cbf8f6e3833dda0be45
@@@ -761,15 -758,8 +761,15 @@@ F test/vtabE.test 7c4693638d7797ce2eda1
  F test/vtab_alter.test 9e374885248f69e251bdaacf480b04a197f125e5
  F test/vtab_err.test 0d4d8eb4def1d053ac7c5050df3024fd47a3fbd8
  F test/vtab_shared.test 0eff9ce4f19facbe0a3e693f6c14b80711a4222d
 +F test/wal.test 830fc2d723fc4c55ef5666141e3a54e0cedd87e5
 +F test/walbak.test f6fde9a5f59d0c697cb1f4af7876178c2f69a7ba
 +F test/walcrash.test f022cee7eb7baa5fb898726120a6a4073dd831d1
 +F test/walhook.test 287a69d662939604f2e0452dace2cec8ef634d5e
 +F test/walmode.test 40119078da084e6a7403ba57485d5a86ee0e2646
 +F test/walslow.test 38076d5fad49e3678027be0f8110e6a32d531dc2
 +F test/walthread.test c9c3b5d19eeb4968254d93f61a7ccd6e8b63f554
  F test/where.test de337a3fe0a459ec7c93db16a519657a90552330
- F test/where2.test 45eacc126aabb37959a387aa83e59ce1f1f03820
+ F test/where2.test 43d4becaf5a5df854e6c21d624a1cb84c6904554
  F test/where3.test aa44a9b29e8c9f3d7bb94a3bb3a95b31627d520d
  F test/where4.test e9b9e2f2f98f00379e6031db6a6fca29bae782a2
  F test/where5.test fdf66f96d29a064b63eb543e28da4dfdccd81ad2
@@@ -811,14 -801,14 +811,14 @@@ F tool/speedtest2.tcl ee2149167303ba8e9
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- P a012aed498bf41a5f6f3006182b0c4c2ab0fe1bb
- R 8c6bff1c20fef6364d82d75506d94733
 -P f660be615a0c1f4641782a83744533f5d3119218
 -R 037eba7c61c44ed46ed186528ab88ba6
++P 8660cda6f8ef43bd276897ef3b5fc2376b5684dc 946e06cd2a2cc209b0786b7e9d28c0746320d646
++R 34e37e2e07b357ad442391f6d6aea47a
  U drh
- Z 01ae0928e38536e336a0fa4223ef6f3d
 -Z f87382a5b2e28a51f3f0db30682d2137
++Z f36c3392b22f93b3ce95c9951a47e7e6
  -----BEGIN PGP SIGNATURE-----
  Version: GnuPG v1.4.6 (GNU/Linux)
  
- iD8DBQFL2xfKoxKgR168RlERAu5rAKCJ9R7soT0Y2Sx2CpYlaWrlm57SuACeIVK9
- g9rON3+p6pxGk+AOwiTbLws=
- =wAdF
 -iD8DBQFL20WioxKgR168RlERAlxiAJ4w8aexa2GTqhDb3cG3AfHpTGYYtACeMOWV
 -+0spJvIkBg57uJ7hlauNec4=
 -=n48A
++iD8DBQFL21l5oxKgR168RlERAqNRAJ906Wol3RyZLztZzmkcpokv0+CtRgCfbeMz
++ohrTG6i1s6JqVvmqdQdSCDg=
++=50x7
  -----END PGP SIGNATURE-----

diff --cc manifest.uuid
index 74da902bdfda5638ecb1b5e5f8a4b5451c5296bf,d3d05c9085cba8e3ae10fd2e869722d8afe8ff1d..695f751f0863788d9e23d35f94bb65f83df7220c
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 8660cda6f8ef43bd276897ef3b5fc2376b5684dc
 -946e06cd2a2cc209b0786b7e9d28c0746320d646
++76bf0eee1fd4003a3f1c39922f8f059611d41dd0