Merge the fts5-btree-index branch with this one. FTS5 changes only.

FossilOrigin-Name: 9f1dcdc3e1644c21762dacf619fac70afe6318c5

diff --cc ext/fts5/fts5_index.c
index 2d23607d3f24957592f9fdada56dfffa4b35fcc2,973a511bd106fdc2144e7120496a5a0153a4c168..b43624d88fd6aa2765340d39a484fe5a4c7d5138
--- 1/ext/fts5/fts5_index.c
--- 2/ext/fts5/fts5_index.c
+++ b/ext/fts5/fts5_index.c
@@@ -398,6 -399,10 +399,10 @@@ struct Fts5SegWriter 
  
    int nDlidx;                     /* Allocated size of aDlidx[] array */
    Fts5DlidxWriter *aDlidx;        /* Array of Fts5DlidxWriter objects */
 -  Fts5Buffer btterm;              /* TODO: Docs */
 -  int iBtPage;                    /* TODO: This */
+ 
+   /* Values to insert into the %_idx table */
++  Fts5Buffer btterm;              /* Next term to insert into %_idx table */
++  int iBtPage;                    /* Page number corresponding to btterm */
  };
  
  /*

diff --cc ext/fts5/test/fts5al.test
index cc6435bb0ef7cc8e090356a92af3f636f7cedde0,cc6435bb0ef7cc8e090356a92af3f636f7cedde0..99dfeb357bc4394703e62aa6f3a45fe02917e3cc
--- 1/ext/fts5/test/fts5al.test
--- 2/ext/fts5/test/fts5al.test
+++ b/ext/fts5/test/fts5al.test
@@@ -26,17 -26,17 +26,17 @@@ ifcapable !fts5 
  do_execsql_test 1.1 {
    CREATE VIRTUAL TABLE ft1 USING fts5(x);
    SELECT * FROM ft1_config;
--} {version 2}
++} {version 3}
  
  do_execsql_test 1.2 {
    INSERT INTO ft1(ft1, rank) VALUES('pgsz', 32);
    SELECT * FROM ft1_config;
--} {pgsz 32 version 2}
++} {pgsz 32 version 3}
  
  do_execsql_test 1.3 {
    INSERT INTO ft1(ft1, rank) VALUES('pgsz', 64);
    SELECT * FROM ft1_config;
--} {pgsz 64 version 2}
++} {pgsz 64 version 3}
  
  #--------------------------------------------------------------------------
  # Test the logic for parsing the rank() function definition.

diff --cc ext/fts5/test/fts5version.test
index 1ae75fd2ae0dcd2db2e3bf9464a3d99a43ffcf37,1ae75fd2ae0dcd2db2e3bf9464a3d99a43ffcf37..8c5a77214698d6811b31de62c7d14a0d85f6f4e1
--- 1/ext/fts5/test/fts5version.test
--- 2/ext/fts5/test/fts5version.test
+++ b/ext/fts5/test/fts5version.test
@@@ -30,34 -30,34 +30,34 @@@ do_execsql_test 1.1 
  
  do_execsql_test 1.2 {
    SELECT * FROM t1_config WHERE k='version'
--} {version 2}
++} {version 3}
  
  do_execsql_test 1.3 {
    SELECT rowid FROM t1 WHERE t1 MATCH 'a';
  } {1}
  
  do_execsql_test 1.4 {
--  UPDATE t1_config set v=3 WHERE k='version';
++  UPDATE t1_config set v=4 WHERE k='version';
  } 
  
  do_test 1.5 {
    db close
    sqlite3 db test.db
    catchsql { SELECT * FROM t1 WHERE t1 MATCH 'a' }
--} {1 {invalid fts5 file format (found 3, expected 2) - run 'rebuild'}}
++} {1 {invalid fts5 file format (found 4, expected 3) - run 'rebuild'}}
  
  do_test 1.6 {
    db close
    sqlite3 db test.db
    catchsql { INSERT INTO t1 VALUES('x y z') }
--} {1 {invalid fts5 file format (found 3, expected 2) - run 'rebuild'}}
++} {1 {invalid fts5 file format (found 4, expected 3) - run 'rebuild'}}
  
  do_test 1.7 {
    execsql { DELETE FROM t1_config WHERE k='version' }
    db close
    sqlite3 db test.db
    catchsql { SELECT * FROM t1 WHERE t1 MATCH 'a' }
--} {1 {invalid fts5 file format (found 0, expected 2) - run 'rebuild'}}
++} {1 {invalid fts5 file format (found 0, expected 3) - run 'rebuild'}}
  
  
  finish_test

diff --cc manifest
index adb03d3d22c53507941f79b51bb8d43a8d420787,d32799ce12b814b2f04294b9f39ba26ce4798646..09bfd81d225dec69a050b084a21835ba606fa954
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Remove\sa\sduplicated\s"if"\scondition\sfrom\sfts3.c.
- D 2015-07-25T19:26:52.805
 -C Bump\sthe\s"version"\sfield\sin\sthe\sfts5\sconfig\stable.
 -D 2015-07-27T11:49:01.364
++C Merge\sthe\sfts5-btree-index\sbranch\swith\sthis\sone.\sFTS5\schanges\sonly.
++D 2015-07-27T12:19:11.594
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 4de3ef40c8b3b75c0c55ff4242a43c8ce1ad90ee
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -106,15 -106,15 +106,15 @@@ F ext/fts3/unicode/mkunicode.tcl 95cf7e
  F ext/fts3/unicode/parseunicode.tcl da577d1384810fb4e2b209bf3313074353193e95
  F ext/fts5/extract_api_docs.tcl 06583c935f89075ea0b32f85efa5dd7619fcbd03
  F ext/fts5/fts5.h 81d1a92fc2b4bd477af7e4e0b38b456f3e199fba
- F ext/fts5/fts5Int.h 8d9bce1847a10df2e4ed9492ea4f3868276748fb
+ F ext/fts5/fts5Int.h 4d669e2ef0f8d51380c78403fd310ee69ce0f70e
  F ext/fts5/fts5_aux.c 044cb176a815f4388308738437f6e130aa384fb0
  F ext/fts5/fts5_buffer.c 80f9ba4431848cb857e3d2158f5280093dcd8015
- F ext/fts5/fts5_config.c b2456e9625bca41c51d54c363e369c6356895c90
+ F ext/fts5/fts5_config.c fdfa63ae8e527ecfaa50f94063c610429cc887cf
  F ext/fts5/fts5_expr.c 56dcbcbdc9029dd76a31360de664559839f4be41
- F ext/fts5/fts5_hash.c ff07722c73587c12781213133edbdb22cd156378
- F ext/fts5/fts5_index.c 892c13a7f44b68e962a91af62f2078f23fabb241
+ F ext/fts5/fts5_hash.c 4bf4b99708848357b8a2b5819e509eb6d3df9246
 -F ext/fts5/fts5_index.c 02b4d8b0ca77cb00af6cbedd3aa1aaaa18608e3f
++F ext/fts5/fts5_index.c f5b25da3a2eef71f2024a08323a1575eb55f7aad
  F ext/fts5/fts5_main.c 0de7ba81488d2c502c8e794eaf7983d468e4c6e9
- F ext/fts5/fts5_storage.c 1c35a38a564ee9cadcbd7ae0b13a806bdda722bd
+ F ext/fts5/fts5_storage.c 22ec9b5d35a39e2b5b65daf4ba7cd47fbb2d0df5
  F ext/fts5/fts5_tcl.c 85eb4e0d0fefa9420b78151496ad4599a1783e20
  F ext/fts5/fts5_tokenize.c 30f97a8c74683797b4cd233790444fbefb3b0708
  F ext/fts5/fts5_unicode2.c 78273fbd588d1d9bd0a7e4e0ccc9207348bae33c
@@@ -134,7 -134,7 +134,7 @@@ F ext/fts5/test/fts5ah.test b9e78fa986a
  F ext/fts5/test/fts5ai.test f20e53bbf0c55bc596f1fd47f2740dae028b8f37
  F ext/fts5/test/fts5aj.test 05b569f5c16ea3098fb1984eec5cf50dbdaae5d8
  F ext/fts5/test/fts5ak.test 7b8c5df96df599293f920b7e5521ebc79f647592
--F ext/fts5/test/fts5al.test fc60ebeac9d8e366e71309d4c31fa72199d711d7
++F ext/fts5/test/fts5al.test 440d77c0b39ba73bad2ceb8986c2bb1093570735
  F ext/fts5/test/fts5alter.test 6022c61467a82aa11c70822ccad22b328dcf0d04
  F ext/fts5/test/fts5auto.test caa5bcf917db11944655a2a9bd38c67c520376ca
  F ext/fts5/test/fts5aux.test 8c687c948cc98e9a94be014df7d518acc1b3b74f
@@@ -175,7 -175,7 +175,7 @@@ F ext/fts5/test/fts5unicode.test fbef8d
  F ext/fts5/test/fts5unicode2.test c1dd890ba32b7609adba78e420faa847abe43b59
  F ext/fts5/test/fts5unicode3.test 35c3d02aa7acf7d43d8de3bfe32c15ba96e8928e
  F ext/fts5/test/fts5unindexed.test e9539d5b78c677315e7ed8ea911d4fd25437c680
--F ext/fts5/test/fts5version.test c54a708236642bcc850d2aedc6f505fef1d9f9f1
++F ext/fts5/test/fts5version.test 205beb2a67d9496af64df959e6a19238f69b83e8
  F ext/fts5/test/fts5vocab.test cdf97b9678484e9bad5062edf9c9106e5c3b0c5c
  F ext/fts5/tool/loadfts5.tcl 95edf0b6b92a09f9ed85595038b1108127987556
  F ext/fts5/tool/mkfts5c.tcl 5745072c7de346e18c7f491e4c3281fe8a1cfe51
@@@ -1366,7 -1366,7 +1366,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 7efed5786bb6a7a452f5aece9d6c6a09e6930939
- R 02cd6ad3aa414fdb248eb64044a0f9b8
 -P 427bf09ba41158041d774aac2b5ffbd062c6eabe
 -R dd5f4cbec3d919d6d2cbe693849f483e
++P ee348b12754abda1fe13231c1868faca9d78481c 92c9178933ef95e92c343c0a741a76bbdf071966
++R 8f58f88db8a7564cc507b9707cc8c853
  U dan
- Z 8274b8233f11154aae74796194660376
 -Z 155465e09dceab5a219267d7a2262f60
++Z 9ebcb4f7d5c62fb47a944f9a469a2828

diff --cc manifest.uuid
index 2a5f4311298a86705ea6c5a10604d69066013050,ad4fb80e802f9749bf319eedc862b07eb768ef45..f3df1362fe5f4a65c8ec904c5677773b269af8d5
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- ee348b12754abda1fe13231c1868faca9d78481c
 -92c9178933ef95e92c343c0a741a76bbdf071966
++9f1dcdc3e1644c21762dacf619fac70afe6318c5