Merge together the fork in the query-planner-tweaks branch.

FossilOrigin-Name: 2daab6bd42b34b32de46db513437cc4d6ca17975

diff --cc manifest
index 26fa848acab087295396691d9c1053b908583bc5,7cbd6538006ce57903a3acbe54a0a077e307702b..6a2746f92b9fc7525b9f772c2a327093fcbeb025
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\sa\scompiler\swarning\swhen\sSTAT2\sis\soff.\s\sMore\stest\scases.\s\sFix\slegacy\stests\nto\sdeal\swith\sthe\snew\sSTAT2\slogic.
- D 2011-08-06T01:22:50.386
 -C Allow\sthe\ssqlite_stat2\stable\sto\scontain\sa\snumber\sof\ssamples\sother\sthan\nthe\sdefault\sof\s10.
 -D 2011-08-05T01:09:49.877
++C Merge\stogether\sthe\sfork\sin\sthe\squery-planner-tweaks\sbranch.
++D 2011-08-06T02:03:10.239
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 1e6988b3c11dee9bd5edc0c804bd4468d74a9cdc
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -118,7 -118,7 +118,7 @@@ F sqlite.pc.in 42b7bf0d02e08b9e77734a47
  F sqlite3.1 6be1ad09113570e1fc8dcaff84c9b0b337db5ffc
  F sqlite3.pc.in ae6f59a76e862f5c561eb32a380228a02afc3cad
  F src/alter.c ac80a0f31189f8b4a524ebf661e47e84536ee7f5
- F src/analyze.c b1df43e5452fc6bcb14a6503c67bfcbdffddc2fe
 -F src/analyze.c ddc492c18b9caf6daf654fe5a3b1efc185e29a7b
++F src/analyze.c 19894783b6f833337ae7e56001c96dc3795d2a83
  F src/attach.c 12c6957996908edc31c96d7c68d4942c2474405f
  F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34
  F src/backup.c 986c15232757f2873dff35ee3b35cbf935fc573c
@@@ -250,34 -250,33 +250,34 @@@ F src/vtab.c 901791a47318c0562cd0c676a2
  F src/wal.c 3154756177d6219e233d84291d5b05f4e06ff5e9
  F src/wal.h 66b40bd91bc29a5be1c88ddd1f5ade8f3f48728a
  F src/walker.c 3112bb3afe1d85dc52317cb1d752055e9a781f8f
- F src/where.c 7d09f4c1512affb60cc1190a4b33d121d4ce039a
+ F src/where.c b8ebb50b82578761e5e764c5c16d7693049a523f
 -F test/8_3_names.test b93687beebd17f6ebf812405a6833bae5d1f4199
 +F test/8_3_names.test 631ea964a3edb091cf73c3b540f6bcfdb36ce823
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
  F test/alias.test 4529fbc152f190268a15f9384a5651bbbabc9d87
  F test/all.test 52fc8dee494092031a556911d404ca30a749a30b
 -F test/alter.test a3f570072b53d7c0fe463bab3f5affa8e113c487
 -F test/alter2.test e0c09d630d650ea32333781a4ed3c45eb02c4289
 -F test/alter3.test 8677e48d95536f7a6ed86a1a774744dadcc22b07
 -F test/alter4.test 1e5dd6b951e9f65ca66422edff02e56df82dd403
 +F test/alter.test 5314fc01ef51ab8af0b8890725b710ed48d4806b
 +F test/alter2.test 7ea05c7d92ac99349a802ef7ada17294dd647060
 +F test/alter3.test 49c9d9fba2b8fcdce2dedeca97bbf1f369cc548d
 +F test/alter4.test b2debc14d8cbe4c1d12ccd6a41eef88a8c1f15d5
  F test/altermalloc.test e81ac9657ed25c6c5bb09bebfa5a047cd8e4acfc
  F test/analyze.test c8cb89e8736336f1f0646c8123e6028a14c7b55e
 -F test/analyze2.test 8f2b1534d43f5547ce9a6b736c021d4192c75be3
 +F test/analyze2.test b2c53cf72aa65383da991d97b9d3ec7b45f72c03
  F test/analyze3.test d61f55d8b472fc6e713160b1e577f7a68e63f38b
  F test/analyze4.test 757b37875cf9bb528d46f74497bc789c88365045
- F test/analyze5.test 1de8d66b11aae5a1453aa042d62e834a476bac9c
+ F test/analyze5.test f6c250012b173f9b10ae5d577e9592767b376b1c
  F test/analyze6.test c125622a813325bba1b4999040ddc213773c2290
- F test/analyze7.test 5508e7828164ea0b518ed219bed7320a481863d4
+ F test/analyze7.test ed672a2c09c4b5a5b528ca38951318af463bb17e
 -F test/async.test ad4ba51b77cd118911a3fe1356b0809da9c108c3
 -F test/async2.test bf5e2ca2c96763b4cba3d016249ad7259a5603b6
 -F test/async3.test 93edaa9122f498e56ea98c36c72abc407f4fb11e
 +F test/analyze8.test ff7a3b4631c896a51e7404268796c61d74117e9f
 +F test/async.test 1d0e056ba1bb9729283a0f22718d3a25e82c277b
 +F test/async2.test c0a9bd20816d7d6a2ceca7b8c03d3d69c28ffb8b
 +F test/async3.test d73a062002376d7edc1fe3edff493edbec1fc2f7
  F test/async4.test 1787e3952128aa10238bf39945126de7ca23685a
 -F test/async5.test f3592d79c84d6e83a5f50d3fd500445f7d97dfdf
 -F test/attach.test 2bb09073d7d5499127db00f50780766dcea913e1
 -F test/attach2.test a295d2d7061adcee5884ef4a93c7c96a82765437
 -F test/attach3.test bd9830bc3a0d22ed1310c9bff6896927937017dc
 +F test/async5.test 0dd8701bd588bf6e70c2557a22ae3f22b2567b4c
 +F test/attach.test 0e6f8de2589f11a5f474ef57fe5af2877e61c0e8
 +F test/attach2.test e54436ed956d3d88bdee61221da59bf3935a0966
 +F test/attach3.test d89ccfe4fe6e2b5e368d480fcdfe4b496c54cf4e
  F test/attach4.test 31f9eb0ca7bdbc393cc4657b877903a226a83d4b
 -F test/attachmalloc.test 1d5b821a676f7bf0b00d87cc106b78966789ba57
 +F test/attachmalloc.test 3a4bfca9545bfe906a8d2e622de10fbac5b711b0
  F test/auth.test b047105c32da7db70b842fd24056723125ecc2ff
  F test/auth2.test 270baddc8b9c273682760cffba6739d907bd2882
  F test/auth3.test a4755e6a2a2fea547ffe63c874eb569e60a28eb5
@@@ -956,7 -954,7 +956,7 @@@ F tool/symbols.sh caaf6ccc7300fd4335331
  F tool/tostr.awk 11760e1b94a5d3dcd42378f3cc18544c06cfa576
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
  F tool/warnings.sh 2ebae31e1eb352696f3c2f7706a34c084b28c262
- P e93c248c8470622944cf7f9e5af4f10c4e4809e3
- R 4c0da7c33e60748bbef1bc20f3ff5e64
 -P c8ba8855d8e93cd1e7dbbc9398a5f850fed5a382
 -R bebd47644403e6f2ebc393eb54e2f9ac
++P 7e914aa999d9f3f7be58a4494d33a7876af56603 b9d41c3490bf325915227a32b612e6772fb62fa9
++R c43dfa67e269269636fb7d00fce4d038
  U drh
- Z d7b9f3f4715d72ce86f406011b991106
 -Z b87fb16f7b3449ea6f690e5d66519d60
++Z 2a4dca5bf1206d663b012fe85305a05e

diff --cc manifest.uuid
index 9cb64d118c1b17efa87c43cdfc9d6f96b1eeab9f,0e29e8359d95cd6e0ba2c630d1d351e1c5f322f5..c8d9795b4a448e77a88ed3a7d87c436dcfc5ac39
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 7e914aa999d9f3f7be58a4494d33a7876af56603
 -b9d41c3490bf325915227a32b612e6772fb62fa9
++2daab6bd42b34b32de46db513437cc4d6ca17975

diff --cc src/analyze.c
Simple merge