Cut over the next generation query planner. Increase the version number

to 3.8.0.

FossilOrigin-Name: 0fe31f60cadc5fe5a9d87e110bfaed5fd026cba1

diff --cc VERSION
index 9a4c4371ee76ad93a2f27f63f155243e888a44fd,9a4c4371ee76ad93a2f27f63f155243e888a44fd..19811903a7f7584d7aa752ea29bbf9d74cf78b47
--- 1/VERSION
--- 2/VERSION
+++ b/VERSION
@@@ -1,1 -1,1 +1,1 @@@
--3.7.17
++3.8.0

diff --cc ext/fts3/fts3.c
Simple merge

diff --cc manifest
index cb36277b866b873c917816d7de6724a900564480,a758c3108d58ca6d9702a84f2655806c96dced01..57254857ae971e43defda5220b886cc9a24bc848
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,12 -1,12 +1,12 @@@
- C Remove\san\sunused\sfunction\sdeclaration\sfrom\sthe\sFTS3\ssource\scode.
- D 2013-06-21T18:36:44.416
 -C Fix\san\suninitialized\svariable\sdetected\sby\svalgrind.\s\sUnclear\swhether\sor\snot\nthis\sshould\sapply\sto\strunk.
 -D 2013-06-26T00:34:13.504
++C Cut\sover\sthe\snext\sgeneration\squery\splanner.\s\sIncrease\sthe\sversion\snumber\nto\s3.8.0.
++D 2013-06-26T11:43:18.908
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
  F Makefile.msc 7d226394826f060f232c0a02a468e8651819b7c2
  F Makefile.vxworks db21ed42a01d5740e656b16f92cb5d8d5e5dd315
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
--F VERSION 05c7bd63b96f31cfdef5c766ed91307ac121f5aa
++F VERSION f135b651727f978b7191bd6fa12c7fc1e13e13ac
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F addopcodes.awk 17dc593f791f874d2c23a0f9360850ded0286531
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
@@@ -78,9 -78,9 +78,9 @@@ F ext/fts3/README.content fdc666a70d525
  F ext/fts3/README.syntax a19711dc5458c20734b8e485e75fb1981ec2427a
  F ext/fts3/README.tokenizers e0a8b81383ea60d0334d274fadf305ea14a8c314
  F ext/fts3/README.txt 8c18f41574404623b76917b9da66fcb0ab38328d
- F ext/fts3/fts3.c 3cb4afd0accf903fbe66e2cc48d6f44e5ccb8a76
 -F ext/fts3/fts3.c 760fecd100598dc22f9733d472b7cf2e9375c620
++F ext/fts3/fts3.c 6dbb5c424144465782d5bf0d23be89907c972454
  F ext/fts3/fts3.h 3a10a0af180d502cecc50df77b1b22df142817fe
 -F ext/fts3/fts3Int.h cb4df04cf886d9920a71df9e8faaa5aae2fa48c6
 +F ext/fts3/fts3Int.h a50cd231e906da818f00f0a81845bbf7bbeba002
  F ext/fts3/fts3_aux.c b02632f6dd0e375ce97870206d914ea6d8df5ccd
  F ext/fts3/fts3_expr.c f8eb1046063ba342c7114eba175cabb31c4a64e7
  F ext/fts3/fts3_hash.c 8dd2d06b66c72c628c2732555a32bc0943114914
@@@ -530,21 -531,21 +531,21 @@@ F test/fts3expr3.test 9e91b8edbcb197bf2
  F test/fts3fault.test cb72dccb0a3b9f730f16c5240f3fcb9303eb1660
  F test/fts3fault2.test 3198eef2804deea7cac8403e771d9cbcb752d887
  F test/fts3first.test dbdedd20914c8d539aa3206c9b34a23775644641
- F test/fts3malloc.test 1e3df7598534e77a7072aad610d46554cface3e9
- F test/fts3matchinfo.test ecb08f586d027eb03941bcfcded6cb9d8ccb3a66
 -F test/fts3malloc.test e1c629e1c42bfaa4e81502f0292fecb84175a525
++F test/fts3malloc.test b0e4c133b8d61d4f6d112d8110f8320e9e453ef6
+ F test/fts3matchinfo.test 3f297e14e3f0d5be8595246f5fcd426625cc5881
  F test/fts3near.test 12895557870b0f9af7cc0be81a0171abb2d12f12
  F test/fts3prefix.test b36d4f00b128a51e7b386cc013a874246d9d7dc1
- F test/fts3prefix2.test 477ca96e67f60745b7ac931cfa6e9b080c562da5
- F test/fts3query.test ef79d31fdb355d094baec1c1b24b60439a1fb8a2
+ F test/fts3prefix2.test e1f0a822ca661dced7f12ce392e14eaf65609dce
+ F test/fts3query.test 4fefd43ff24993bc2c9b2778f2bec0cc7629e7ed
  F test/fts3rnd.test 1320d8826a845e38a96e769562bf83d7a92a15d0
- F test/fts3shared.test c2f60e152e8554549eb25f0a7593ea01389c5037
- F test/fts3snippet.test 8e956051221a34c7daeb504f023cb54d5fa5a8b2
- F test/fts3sort.test 95be0b19d7e41c44b29014f13ea8bddd495fd659
- F test/fts3tok1.test 4d9e7401679dc71f6b2f76416309b923210bfdbe
- F test/fts3tok_err.test 41e5413139c2ef536ffadfcd1584ee50b1665ec0
+ F test/fts3shared.test 57e26a801f21027b7530da77db54286a6fe4997e
+ F test/fts3snippet.test 24d6ff1920a70fd970c401a8525834b4ad12cece
+ F test/fts3sort.test ed34c716a11cc2009a35210e84ad5f9c102362ca
+ F test/fts3tok1.test b10d0a12a0ab5f905cea1200b745de233f37443f
+ F test/fts3tok_err.test 52273cd193b9036282f7bacb43da78c6be87418d
  F test/fts4aa.test 95f448fb02c4a976968b08d1b4ce134e720946ae
  F test/fts4check.test 66fa274cab2b615f2fb338b257713aba8fad88a8
- F test/fts4content.test 6efc53b4fd03cab167e6998d2b0b7d4b7d419ee6
+ F test/fts4content.test 2e7252557d6d24afa101d9ba1de710d6140e6d06
  F test/fts4langid.test 24a6e41063b416bbdf371ff6b4476fa41c194aa7
  F test/fts4merge.test c424309743fdd203f8e56a1f1cd7872cd66cc0ee
  F test/fts4merge2.test 5faa558d1b672f82b847d2a337465fa745e46891
@@@ -707,7 -708,7 +709,7 @@@ F test/pagesize.test 1dd51367e752e742f5
  F test/pcache.test 065aa286e722ab24f2e51792c1f093bf60656b16
  F test/pcache2.test a83efe2dec0d392f814bfc998def1d1833942025
  F test/percentile.test 4614301e38398df7fdd5f28f4ed8f272b328251b
- F test/permutations.test 7161be2569550924a8a437272acabfe9e6f48b86
 -F test/permutations.test 02a3c0174c943734d710ac01ca465198bff05819
++F test/permutations.test 461ef4ea10db02cd421dfe5f988eac3e99b5cd9a
  F test/pragma.test 5e7de6c32a5d764f09437d2025f07e4917b9e178
  F test/pragma2.test 3a55f82b954242c642f8342b17dffc8b47472947
  F test/printf.test ec9870c4dce8686a37818e0bf1aba6e6a1863552
@@@ -1093,8 -1094,9 +1095,9 @@@ F tool/tostr.awk e75472c2f98dd76e06b8c9
  F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
+ F tool/wherecosttest.c f407dc4c79786982a475261866a161cd007947ae
  F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
- P 361084e1eb281e985568d19fe217263be92be31d
- R 0d6c636b8cfd628682ea33e027cb07be
 -P 604c3c5de6fd8f8a569aa9ed981055a5b0123ba1
 -R 2ed2dcc6fe1201d795c5181c6afd8a91
++P 096ae1d8f9a08f92daedece6b0615f4d22b05023 19ab4811d542ba781aeb6a4eb3c74642677225e1
++R f73808040fac6ead247f9d2a50c342d8
  U drh
- Z 55b5720fc386809651d148c0a8415781
 -Z 9f76be0e05737d7f0f0ba2111ccc0b78
++Z e52529fd895183a80c4903c58cf391c1

diff --cc manifest.uuid
index 773d5a6db01b0ea7f1780764f8257ad47f2ca7e0,4852f228668292b3352a9615c8b7b8100bb72564..de60777b86f9916b5153e8fa951d97eae79cec90
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 096ae1d8f9a08f92daedece6b0615f4d22b05023
 -19ab4811d542ba781aeb6a4eb3c74642677225e1
++0fe31f60cadc5fe5a9d87e110bfaed5fd026cba1

diff --cc test/fts3malloc.test
Simple merge

diff --cc test/permutations.test
Simple merge