Merge changes to the query planner that strive to ensure that any index

usage that is a proper subset of some other index usage always has a slightly
higher cost.

FossilOrigin-Name: 683dd379a293b2f330e1e4cd746f190527fe48ee

diff --cc manifest
index 26b58d03cf1f5e9cb494bfe7e889e559a31652ef,35a72e84b6d96ea5ac5b37c6383261f595a5eafe..d36a69418adb61001f3e70c88579add23a5fae7c
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Ensure\sthe\s"PRAGMA\sjournal_mode=WAL"\sworks\scoming\sfrom\sany\sother\sjournal_mode\nwith\sATTACH-ed\sdatabases.
- D 2014-04-04T14:12:52.073
 -C Remove\san\sunnecessary\sconditional.
 -D 2014-03-31T20:05:20.135
++C Merge\schanges\sto\sthe\squery\splanner\sthat\sstrive\sto\sensure\sthat\sany\sindex\s\nusage\sthat\sis\sa\sproper\ssubset\sof\ssome\sother\sindex\susage\salways\shas\sa\sslightly\nhigher\scost.
++D 2014-04-04T18:20:35.620
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -291,7 -291,7 +291,7 @@@ F src/vtab.c 21b932841e51ebd7d075e2d0ad
  F src/wal.c 76e7fc6de229bea8b30bb2539110f03a494dc3a8
  F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
  F src/walker.c 11edb74d587bc87b33ca96a5173e3ec1b8389e45
- F src/where.c ebad891b7494d0c5f925cf7ab135380bd958cba3
 -F src/where.c 7b5010f5c4d6cf81a8d6fcc9e09b05faad71b395
++F src/where.c 70eb10da08cebbd6a576ced18edb7c8f79d41597
  F src/whereInt.h 2564055b440e44ebec8b47f237bbccae6719b7af
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
@@@ -1092,7 -1092,8 +1092,8 @@@ F test/whereC.test d6f4ecd4fa2d9429681a
  F test/whereD.test 6c2feb79ef1f68381b07f39017fe5f9b96da8d62
  F test/whereE.test b3a055eef928c992b0a33198a7b8dc10eea5ad2f
  F test/whereF.test 5b2ba0dbe8074aa13e416b37c753991f0a2492d7
 -F test/whereG.test eb3a46b3eaf38e25e3013433b2db8a25a866c215
 +F test/whereG.test 2533b72ed4a31fd1687230a499b557b911525344
+ F test/whereH.test e4b07f7a3c2f5d31195cd33710054c78667573b2
  F test/wherelimit.test 5e9fd41e79bb2b2d588ed999d641d9c965619b31
  F test/wild001.test bca33f499866f04c24510d74baf1e578d4e44b1c
  F test/win32heap.test ea19770974795cff26e11575e12d422dbd16893c
@@@ -1159,7 -1160,7 +1160,8 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
  F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
- P d5513dfa23baa0b0a095aaf17d19aacd30dcef61
- R dda37fe73fefd9a3a9bbbb33bf2f4700
 -P b7830d232b073a197aa1092e78cb24e88cb10fd3
 -R ddf1c9d2d849c5f13c78d81687d216d7
++P e54330b43127e46fc6494748cbb353a6fc91cfd7 7473c4dfc10a47594affa6f4e071a08dc8838c0c
++R dcb8d4aedf5f44fc76078dc97c08f05d
++T +closed 7473c4dfc10a47594affa6f4e071a08dc8838c0c
  U drh
- Z ec7ec754ade71c9dc3d6dc5092f63d72
 -Z 7ba197d4f98bb2ab782217a2f7675fd9
++Z b9b64aa08b9101816e80a031012d4116

diff --cc manifest.uuid
index f9214073e9fd79c2b6dc46997f3fdafe96bfdee9,2b145830ca0c90e2da97686d01a7138e3c062726..8da78e64c345dba0838a009d0e614138c2cd8cc8
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- e54330b43127e46fc6494748cbb353a6fc91cfd7
 -7473c4dfc10a47594affa6f4e071a08dc8838c0c
++683dd379a293b2f330e1e4cd746f190527fe48ee

diff --cc src/where.c
Simple merge