Bring over the recent query planner enhancements from the trunk.

FossilOrigin-Name: 82969f27e5ea843cb379666d8a02e4a3fddc03b2

diff --cc manifest
index af8652faeb117be24d74166053f25404c2d6e751,00193d3865b4d0b992046723a672e43977cead25..d7f5bd5c6c4e0780ac1e7e9ce7d45d01d5870eac
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,8 +1,8 @@@
- C Add\stests\sand\sfix\sbugs\sin\sWAL\slocking\smechanism.
- D 2010-04-14T18:50:08
+ -----BEGIN PGP SIGNED MESSAGE-----
+ Hash: SHA1
+ 
 -C Further\srefinements\sto\stable\sorder\sselection\son\sjoin\squery\splanning.
 -D 2010-04-15T01:04:54
++C Bring\sover\sthe\srecent\squery\splanner\senhancements\sfrom\sthe\strunk.
++D 2010-04-15T02:37:11
  F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
  F Makefile.in 4f2f967b7e58a35bb74fb7ec8ae90e0f4ca7868b
  F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@@ -757,13 -757,9 +760,13 @@@ 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 8f480128b140e54253684bc395f7af0254dc4e03
 +F test/walcrash.test 45cfbab30bb7cbe0b2e9d5cabe90dbcad10cb89b
 +F test/walslow.test 38076d5fad49e3678027be0f8110e6a32d531dc2
 +F test/walthread.test 58cd64b06f186251f09f64e4918fb74a7e52c963
  F test/where.test de337a3fe0a459ec7c93db16a519657a90552330
  F test/where2.test 45eacc126aabb37959a387aa83e59ce1f1f03820
- F test/where3.test 97d3936e6a443b968f1a61cdcc0f673252000e94
+ F test/where3.test aa44a9b29e8c9f3d7bb94a3bb3a95b31627d520d
  F test/where4.test e9b9e2f2f98f00379e6031db6a6fca29bae782a2
  F test/where5.test fdf66f96d29a064b63eb543e28da4dfdccd81ad2
  F test/where6.test 5da5a98cec820d488e82708301b96cb8c18a258b
@@@ -804,7 -800,14 +807,14 @@@ F tool/speedtest2.tcl ee2149167303ba8e9
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- P 9435f3135849e0d38fde1669201db508561a6308
- R 271de1f1c02e1bce44bf2011bef4ef6b
- U dan
- Z 6918d2483c611afa56b459efd78f482c
 -P b87cb0c2bd9c52a938795a974e101879b81210e3
 -R ac19ec910df4152a1528b71c1365be54
++P c18077f2465fc34830f11c9832e76be5746eaeea defaf0d99a807027f8883bf821b6482025f9f54e
++R 5f5abc6d19fbeba7fb34263a5662faa7
+ U drh
 -Z 406deb0be8ed4b7e4bb6e640f59e7f15
++Z 9dfe9b346dd22ca03d0d17a2ddbb8a3c
+ -----BEGIN PGP SIGNATURE-----
+ Version: GnuPG v1.4.6 (GNU/Linux)
+ 
 -iD8DBQFLxmY4oxKgR168RlERAsvwAJ4tlJVE6cdAiLgjUGC8Snj86Xjm4ACeIy59
 -w6HyVplE+rrSW13BtidRydE=
 -=uibN
++iD8DBQFLxnvaoxKgR168RlERAkpHAJ9umCCf7Sfy2xa1T3mJ1bqzrPY7tgCgjEA2
++oN5S7m+hWn0GMbvXKOIs1cY=
++=ADT1
+ -----END PGP SIGNATURE-----

diff --cc manifest.uuid
index 6a496e5b8e4f72dcdef7e565edf742e3b6daf4de,ddeecd995c065c13d4efa82bf7d35bf5de93efd5..232556f3c5adcc5eb51b0fc062a7354e019ccb3d
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- c18077f2465fc34830f11c9832e76be5746eaeea
 -defaf0d99a807027f8883bf821b6482025f9f54e
++82969f27e5ea843cb379666d8a02e4a3fddc03b2