Merge the stat2 query planner enhancements into the trunk.

FossilOrigin-Name: 499edcbc8ab70fcf35431d4e672c68dbcb6c5aad

diff --cc manifest
index 4fe64d4655b60e4f63ef2f557b40eecf708e272f,30a2df5c4d6d39692b9f535c9ae4e814547efec3..eee7dee47dfc8aa535192ab1a72c46142ed1db0b
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,8 -1,8 +1,8 @@@
  -----BEGIN PGP SIGNED MESSAGE-----
  Hash: SHA1
  
- C If\sa\sdeferred\sforeign\skey\sconstraint\sfails\son\sa\sstatement\sthat\sis\snot\spart\nof\sa\slarger\stransation,\smake\ssure\sthat\sthe\sstatement\sfully\sends\sso\sthat\nsubsequent\sinvocations\sof\sthe\ssame\sstatement\swill\snot\spass\sthe\sconstraint\nbecause\sthey\sthink\sthe\stransaction\sis\snot\sclosed.\s\sThis\sis\sa\smerge\sof\nthe\sdeferred-fk-quirk\sbranch\stogether\swith\sa\stest\scase.
- D 2011-02-04T05:47:51.496
 -C Reactivate\sthe\sanalyze5.test\sscript.
 -D 2011-01-28T03:13:58.522
++C Merge\sthe\sstat2\squery\splanner\senhancements\sinto\sthe\strunk.
++D 2011-02-04T06:36:44.125
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in de6498556d536ae60bb8bb10e8c1ba011448658c
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -232,19 -231,19 +232,19 @@@ F src/update.c 227e6cd512108b84f69421fc
  F src/utf.c 1baeeac91707a4df97ccc6141ec0f808278af685
  F src/util.c ab1c92426494f499f42b9e307537b03e923d75c1
  F src/vacuum.c 924bd1bcee2dfb05376f79845bd3b4cec7b54b2f
 -F src/vdbe.c 5d310eaf1a4d8383602126fa82e01291ab7d3cf3
 +F src/vdbe.c 7f54982de40509458ee7ede8e356dccc19f5b161
  F src/vdbe.h 4de0efb4b0fdaaa900cf419b35c458933ef1c6d2
  F src/vdbeInt.h 6e6f28e9bccc6c703dca1372fd661c57b5c15fb0
 -F src/vdbeapi.c 69c82283ab2b64c0c37a07799d771d4058330743
 -F src/vdbeaux.c 33448d23b857654dd69ed2103611f5c733606f68
 +F src/vdbeapi.c 8e9324fd35eb70d0b5904bd1af40f2598744dc4d
 +F src/vdbeaux.c 521b954f21ec15aee2ba5a0af8a1526bdd71e45e
  F src/vdbeblob.c 18955f0ee6b133cd08e1592010cb9a6b11e9984c
- F src/vdbemem.c 411649a35686f54268ccabeda175322c4697f5a6
+ F src/vdbemem.c c011228c6fb1b5df924e4584765b16bde863c9c6
 -F src/vdbetrace.c 864cef96919323482ebd9986f2132435115e9cc2
 +F src/vdbetrace.c 3ba13bc32bdf16d2bdea523245fd16736bed67b5
  F src/vtab.c b297e8fa656ab5e66244ab15680d68db0adbec30
 -F src/wal.c dbca424f71678f663a286ab2a98f947af1d412a7
 -F src/wal.h c1aac6593a0b02b15dc625987e619edeab39292e
 +F src/wal.c 8704a563b37c0c48b6a65d49da5d5656568abfc6
 +F src/wal.h 7a5fbb00114b7f2cd40c7e1003d4c41ce9d26840
  F src/walker.c 3112bb3afe1d85dc52317cb1d752055e9a781f8f
- F src/where.c af069e6b53234118014dabfece96a9515b69d76b
+ F src/where.c f4915ac03e5e42c8416b35ca3ba34af841c00d12
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
  F test/alias.test 4529fbc152f190268a15f9384a5651bbbabc9d87
  F test/all.test 51756962d522e474338e9b2ebb26e7364d4aa125
@@@ -375,10 -375,10 +376,10 @@@ F test/enc.test e54531cd6bf941ee6760be0
  F test/enc2.test 6d91a5286f59add0cfcbb2d0da913b76f2242398
  F test/enc3.test 5c550d59ff31dccdba5d1a02ae11c7047d77c041
  F test/enc4.test 4b575ef09e0eff896e73bd24076f96c2aa6a42de
- F test/eqp.test 69670e7919030f21de29fb99bf1d68f97aedcbdb
+ F test/eqp.test 8f535d902b2df780d22edb95113880480664f976
  F test/eval.test bc269c365ba877554948441e91ad5373f9f91be3
  F test/exclusive.test 53e1841b422e554cecf0160f937c473d6d0e3062
 -F test/exclusive2.test c2f2b2242dc436a12df8dd531e06843053bd3b9a
 +F test/exclusive2.test b65264c3e76e1db6c6eda15c02000a40743f6541
  F test/exec.test e949714dc127eaa5ecc7d723efec1ec27118fdd7
  F test/expr.test 620a636cf7b7d4e5834a0b9d83a4da372e24a7b7
  F test/fallocate.test 43dc34b8c24be6baffadc3b4401ee15710ce83c6
@@@ -864,7 -856,7 +865,7 @@@ F test/walslow.test d21625e2e99e11c032c
  F test/walthread.test a25a393c068a2b42b44333fa3fdaae9072f1617c
  F test/where.test de337a3fe0a459ec7c93db16a519657a90552330
  F test/where2.test 43d4becaf5a5df854e6c21d624a1cb84c6904554
- F test/where3.test 8ebedae552e13fc7f2b4e8df6cbe72a095347400
 -F test/where3.test 858d089cc4bf9aa0b06917a02abd5fd198655c96
++F test/where3.test c81d4ecfaed54e8aef9c1a8a90ac83c9f5c49090
  F test/where4.test e9b9e2f2f98f00379e6031db6a6fca29bae782a2
  F test/where5.test fdf66f96d29a064b63eb543e28da4dfdccd81ad2
  F test/where6.test 5da5a98cec820d488e82708301b96cb8c18a258b
@@@ -908,14 -900,14 +909,14 @@@ F tool/speedtest2.tcl ee2149167303ba8e9
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- P e64e1453a9c204d93de1af92dc0b3ca26762b024 8063197ef141c0c62ba710efdd2b3421fbee4e5d
- R 69d3f0356b4d8f9e9f40d56c45da6c25
 -P 4847c6cb71423248b186ab7842b97c83e2f5fefd
 -R 2a7cda6de985ac7d8bc394704ea20bbe
++P 2f94d4623f9aae1b5bc7041bd85f4e3a7462c60e a2a9f6401c927f6259cda3ba35219cabef24e84d
++R 654ce4e6cf2cefef95b0b26439b60214
  U drh
- Z 9ed074a22966ce70581904f84a2ffc62
 -Z 90a99f0eefff820df6066cb462690f7d
++Z 53e699a32a3e2a35635c3c7b5d97adbf
  -----BEGIN PGP SIGNATURE-----
 -Version: GnuPG v1.4.6 (GNU/Linux)
 +Version: GnuPG v1.4.10 (Darwin)
  
- iEYEARECAAYFAk1LkwcACgkQoxKgR168RlE5awCdFnaZrUhXoj6KrFZElnyy4f9M
- kbMAn19H8xD5tiM5UH35kU9mL5D0eNXv
- =9S5i
 -iD8DBQFNQjR5oxKgR168RlERArUiAJ91iPioq77gB015ZhcABywWj5kEnACghSgp
 -HH7RJ7G2ecFXfbSqcbfkm08=
 -=pv9L
++iEYEARECAAYFAk1LnnwACgkQoxKgR168RlGb5gCdHxqynC2kEpWU39CHtpPLNzYl
++tuEAnRuLHTKqjeTXUQlltmCERn2tuJ1n
++=tbOv
  -----END PGP SIGNATURE-----

diff --cc manifest.uuid
index 6b7ce81723339d5a46e36d82a74ff91207b012db,61f326c2b74a3445a85eb6823020694223f7ad21..16d3cdd38b4ee66bfad289f168bcf2a0c80ec041
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 2f94d4623f9aae1b5bc7041bd85f4e3a7462c60e
 -a2a9f6401c927f6259cda3ba35219cabef24e84d
++499edcbc8ab70fcf35431d4e672c68dbcb6c5aad

diff --cc test/where3.test
index c032f1f0ea698caadbc0eaa6284ceefa907d6956,29ba9e33f0492cda3c5eae8aa68f065570b73170..ce283905a68d6efae494048750a1010d29f35183
--- 1/test/where3.test
--- 2/test/where3.test
+++ b/test/where3.test
@@@ -225,9 -225,10 +225,9 @@@ do_execsql_test where3-3.0 
    ANALYZE;
    explain query plan SELECT * FROM t302, t301 WHERE t302.x=5 AND t301.a=t302.y;
  } {
-   0 0 0 {SCAN TABLE t302 (~0 rows)} 
+   0 0 0 {SCAN TABLE t302 (~1 rows)} 
    0 1 1 {SEARCH TABLE t301 USING INTEGER PRIMARY KEY (rowid=?) (~1 rows)}
  }
 -exit
  do_execsql_test where3-3.1 {
    explain query plan
    SELECT * FROM t301, t302 WHERE t302.x=5 AND t301.a=t302.y;