Merge trunk changes into the fts4-incr-merge branch.

FossilOrigin-Name: f61d5fb0281381228eb1a12a233bacaeb26b12a3

diff --cc manifest
index 925cbf74644c5b23fd092d5545945bca3bb21cfe,60db4f1f2e3489ed1c4484af3a1772500f0752fa..7d1a25eb351348849625446781a6f3dd261907f0
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,10 -1,10 +1,10 @@@
- C Fix\svarious\sincorrect\sand\smissing\scomments\sand\sother\sstyle\sissues\sin\sand\saround\sthe\sFTS\sincremental\smerge\scode.
- D 2012-03-17T16:56:57.450
 -C Remove\sthe\s_SafeInit()\sentry\spoints\sfrom\sthe\sTCL\sinterface.\s\sThey\shave\slong\nbeen\sno-ops.\s\sRemoving\sthem\scompletely\savoids\sconfusion\sas\sto\swhy\sthey\ndon't\swork.
 -D 2012-03-20T15:10:42.442
++C Merge\strunk\schanges\sinto\sthe\sfts4-incr-merge\sbranch.
++D 2012-03-20T17:04:17.255
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in 3f79a373e57c3b92dabf76f40b065e719d31ac34
+ F Makefile.in 2f37e468503dbe79d35c9f6dffcf3fae1ae9ec20
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc 3a5582a858b8071af43cd459bd757f7d0748f66a
- F Makefile.vxworks 1deb39c8bb047296c30161ffa10c1b5423e632f9
+ F Makefile.msc 7849a871b6cdb20fd51baee6bbe5965a03326be4
+ F Makefile.vxworks 3b7fe7a0571fdadc61363ebc1b23732d2d6363ca
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
  F VERSION bb4c2a86abe53ea3c1d6ea515b69a426040e2414
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -63,10 -63,10 +63,10 @@@ F ext/fts3/README.content fdc666a70d525
  F ext/fts3/README.syntax a19711dc5458c20734b8e485e75fb1981ec2427a
  F ext/fts3/README.tokenizers 998756696647400de63d5ba60e9655036cb966e9
  F ext/fts3/README.txt 8c18f41574404623b76917b9da66fcb0ab38328d
- F ext/fts3/fts3.c 806632fd0020eed966ab82ea25fe09f1a4c86907
+ F ext/fts3/fts3.c a62e09140c00f9c401efca661e7f2ae9909194f6
  F ext/fts3/fts3.h 3a10a0af180d502cecc50df77b1b22df142817fe
 -F ext/fts3/fts3Int.h d1d7f964ddee067bcd16a6af4ba7ecf66220056d
 +F ext/fts3/fts3Int.h caa745f80405bc0c0a45a2f83e120d5a2c13753c
- F ext/fts3/fts3_aux.c 72de4cb43db7bfc2f68fbda04b7d8095ae9a6239
+ F ext/fts3/fts3_aux.c 5205182bd8f372782597888156404766edf5781e
  F ext/fts3/fts3_expr.c dbc7ba4c3a6061adde0f38ed8e9b349568299551
  F ext/fts3/fts3_hash.c 8dd2d06b66c72c628c2732555a32bc0943114914
  F ext/fts3/fts3_hash.h 8331fb2206c609f9fc4c4735b9ab5ad6137c88ec
@@@ -77,8 -77,8 +77,8 @@@ F ext/fts3/fts3_term.c d3466cf99432291b
  F ext/fts3/fts3_test.c 6b7cc68aef4efb084e1449f7d20c4b20d3bdf6b4
  F ext/fts3/fts3_tokenizer.c 3da7254a9881f7e270ab28e2004e0d22b3212bce
  F ext/fts3/fts3_tokenizer.h 66dec98e365854b6cd2d54f1a96bb6d428fc5a68
- F ext/fts3/fts3_tokenizer1.c 0dde8f307b8045565cf63797ba9acfaff1c50c68
+ F ext/fts3/fts3_tokenizer1.c 5c98225a53705e5ee34824087478cf477bdb7004
 -F ext/fts3/fts3_write.c 8eedfeb2e61114cfd94fd1d917daf3658203332c
 +F ext/fts3/fts3_write.c a78deea7b575b244d50eea1fdb9bf228c0dd00bb
  F ext/fts3/fts3speed.tcl b54caf6a18d38174f1a6e84219950d85e98bb1e9
  F ext/fts3/mkfts3amal.tcl 252ecb7fe6467854f2aa237bf2c390b74e71f100
  F ext/icu/README.txt bf8461d8cdc6b8f514c080e4e10dc3b2bbdfefa9
@@@ -496,9 -496,7 +496,9 @@@ F test/fts3snippet.test 8e956051221a34c
  F test/fts3sort.test 95be0b19d7e41c44b29014f13ea8bddd495fd659
  F test/fts4aa.test 6e7f90420b837b2c685f3bcbe84c868492d40a68
  F test/fts4content.test 17b2360f7d1a9a7e5aa8022783f5c5731b6dfd4f
- F test/fts4langid.test 2f6ae2e5ab037b11b411c85346a09a5fee503f6d
 -F test/fts4langid.test 2081c357bb6f170f34ef8e08c6abb88002b95c69
++F test/fts4langid.test 24a6e41063b416bbdf371ff6b4476fa41c194aa7
 +F test/fts4merge.test 1c3389a3be18498934baf76afe67663d8b4b5e42
 +F test/fts4merge2.test 5faa558d1b672f82b847d2a337465fa745e46891
  F test/func.test 6c5ce11e3a0021ca3c0649234e2d4454c89110ca
  F test/func2.test 772d66227e4e6684b86053302e2d74a2500e1e0f
  F test/func3.test 001021e5b88bd02a3b365a5c5fd8f6f49d39744a
@@@ -637,8 -635,8 +637,8 @@@ F test/pageropt.test 9191867ed19a2b3db6
  F test/pagesize.test 1dd51367e752e742f58e861e65ed7390603827a0
  F test/pcache.test 065aa286e722ab24f2e51792c1f093bf60656b16
  F test/pcache2.test a83efe2dec0d392f814bfc998def1d1833942025
 -F test/permutations.test 2b5a1b64a8e5114757457fbce9010387d1fe7682
 +F test/permutations.test 0ab1e7748de5d29c4c648ba5ce3b983ab80653d1
- F test/pragma.test f11c59ec935a52edb4d3d5676d456588121fcefa
+ F test/pragma.test c51c148defe32bf4a419a522f95d26838d5cf677
  F test/pragma2.test 3a55f82b954242c642f8342b17dffc8b47472947
  F test/printf.test ec9870c4dce8686a37818e0bf1aba6e6a1863552
  F test/progress.test 5b075c3c790c7b2a61419bc199db87aaf48b8301
@@@ -857,7 -855,7 +857,7 @@@ F test/tkt3997.test a335fa41ca3985660a1
  F test/tkt4018.test 7c2c9ba4df489c676a0a7a0e809a1fb9b2185bd1
  F test/tokenize.test ce430a7aed48fc98301611429595883fdfcab5d7
  F test/trace.test 4b36a41a3e9c7842151af6da5998f5080cdad9e5
- F test/trace2.test 962175290996d5f06dc4402ca218bbfc7df4cb20
 -F test/trace2.test 37c3a05701e7f133ebdf078a61aa9479a23a73b0
++F test/trace2.test 95f6d519f534b171b8d3d1aacbb03931b4443fb4
  F test/trans.test 6e1b4c6a42dba31bd65f8fa5e61a2708e08ddde6
  F test/trans2.test d5337e61de45e66b1fcbf9db833fa8c82e624b22
  F test/trans3.test 373ac5183cc56be69f48ae44090e7f672939f732
@@@ -994,7 -992,7 +994,7 @@@ F tool/tostr.awk e75472c2f98dd76e06b8c9
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
  F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
- P 3475092cff862080a020d386076d739f0d22c9b2
- R ca4e10aa887c331ab5ee7949ea058bc8
- U dan
- Z 5217f3a7f5fecf12c3e93b43d9936afd
 -P 00bb9c9ce4f465e6ac321ced2a9d0062dc364669
 -R 0bae8756351ce6c993966becd439fadf
++P 7aabb62c8ccbd2b8d216e25226f06e5820dec38a 0fb26c7bfa7a4bb1503f90fd6f5b9c70f444665b
++R 58077ce5e1cbaecc58d15ee0d3722b1c
+ U drh
 -Z d1e2a2d0a2cbd6a9676ec1f5c607220d
++Z 8e670a9384f5fc62996e59150aae6127

diff --cc manifest.uuid
index ecbe0fe2b5bcf6430c91d1c02d8e4652473115ac,f2c6d71cbbf8eeb6c410fee1e900c558535012b0..88dba24d9ffc581c891ffb922a716e51e8f7f8ff
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 7aabb62c8ccbd2b8d216e25226f06e5820dec38a
 -0fb26c7bfa7a4bb1503f90fd6f5b9c70f444665b
++f61d5fb0281381228eb1a12a233bacaeb26b12a3

diff --cc test/fts4langid.test
index 012924c70d4ee3cf6314de4c470dea67481d96b4,8ad06766b7eac46f172ff6f3c54d03034a07c43b..843e11f9ab794e35940c92b8b0e9b1d4cff367c3
--- 1/test/fts4langid.test
--- 2/test/fts4langid.test
+++ b/test/fts4langid.test
@@@ -480,8 -479,8 +480,6 @@@ foreach lid [list 4 [expr 1<<30]] 
    do_execsql_test 5.4.$lid.5 {
      SELECT count(*) FROM t6_segdir;
      SELECT count(*) FROM t6_segments;
 -  } {1 0}
 +  } {4 4}
  }
--
--
  finish_test

diff --cc test/trace2.test
index 42738db3aa0f7db4361a894d8815a9592ddd0034,0e3130ec0018d713de9b917bdeda57b6ab3d4973..b1a53e77b5284fa1a06e0324c1630ed9cb5eee4a
--- 1/test/trace2.test
--- 2/test/trace2.test
+++ b/test/trace2.test
@@@ -134,7 -134,7 +134,7 @@@ ifcapable fts3 
      "-- REPLACE INTO 'main'.'x1_stat' VALUES(0,?)" 
      "-- SELECT (SELECT max(idx) FROM 'main'.'x1_segdir' WHERE level = ?) + 1" 
      "-- SELECT coalesce((SELECT max(blockid) FROM 'main'.'x1_segments') + 1, 1)"
--    "-- INSERT INTO 'main'.'x1_segdir' VALUES(?,?,?,?,?,?)"
++    "-- REPLACE INTO 'main'.'x1_segdir' VALUES(?,?,?,?,?,?)"
    }
  
    do_trace_test 2.3 {
@@@ -145,7 -146,7 +146,7 @@@
      "-- SELECT max(level) FROM 'main'.'x1_segdir' WHERE level BETWEEN ? AND ?"
      "-- SELECT coalesce((SELECT max(blockid) FROM 'main'.'x1_segments') + 1, 1)"
      "-- DELETE FROM 'main'.'x1_segdir' WHERE level BETWEEN ? AND ?"
--    "-- INSERT INTO 'main'.'x1_segdir' VALUES(?,?,?,?,?,?)"
++    "-- REPLACE INTO 'main'.'x1_segdir' VALUES(?,?,?,?,?,?)"
    }
  }