Merge in the latest changes from trunk.

FossilOrigin-Name: 66c4aaadda433c9d479a25c27cdff84560088402

diff --cc manifest
index a0020861be70ee042be3bcb7b3ea4b1094300a6e,de13e6de0f95ed50577b4a3ee15b2d1b2f0216e8..da8c3778aeaccfaf035a63da8b92c37685f8d216
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\sa\sproblem\sin\sfts4merge3.test.
- D 2012-03-28T13:55:29.023
 -C Avoid\sloading\soverflow\spages\sjust\sto\ssatisfy\stypeof()\sor\slength()\sfunctions\nif\sthe\scorrect\sresult\scan\sbe\scomputed\swithout\sthe\sextra\spage\sfetches.
 -D 2012-03-28T16:22:03.615
++C Merge\sin\sthe\slatest\schanges\sfrom\strunk.
++D 2012-03-28T16:44:13.607
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 2f37e468503dbe79d35c9f6dffcf3fae1ae9ec20
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -497,13 -495,9 +497,13 @@@ F test/fts3shared.test 8bb266521d7c5495
  F test/fts3snippet.test 8e956051221a34c7daeb504f023cb54d5fa5a8b2
  F test/fts3sort.test 95be0b19d7e41c44b29014f13ea8bddd495fd659
  F test/fts4aa.test 6e7f90420b837b2c685f3bcbe84c868492d40a68
 +F test/fts4check.test 66fa274cab2b615f2fb338b257713aba8fad88a8
  F test/fts4content.test 17b2360f7d1a9a7e5aa8022783f5c5731b6dfd4f
 -F test/fts4langid.test 2081c357bb6f170f34ef8e08c6abb88002b95c69
 +F test/fts4langid.test 24a6e41063b416bbdf371ff6b4476fa41c194aa7
 +F test/fts4merge.test c424309743fdd203f8e56a1f1cd7872cd66cc0ee
 +F test/fts4merge2.test 5faa558d1b672f82b847d2a337465fa745e46891
 +F test/fts4merge3.test 7ca2225996f6c4e12efbd4fe34ce8a805adecfb2
- F test/func.test 6c5ce11e3a0021ca3c0649234e2d4454c89110ca
+ F test/func.test 9809b7622d721904a8cc33c1ffb87f46d506ed01
  F test/func2.test 772d66227e4e6684b86053302e2d74a2500e1e0f
  F test/func3.test 001021e5b88bd02a3b365a5c5fd8f6f49d39744a
  F test/fuzz.test 77fd50afc12847af50fcf1941679d90adebadde6
@@@ -999,7 -993,7 +999,7 @@@ F tool/tostr.awk e75472c2f98dd76e06b8c9
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
  F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
- P e31076319363a46905836880765bae3bf204ed19
- R 8261f69797f0415c0a684d0e5b4da417
- U dan
- Z 6d2d05b1946beea93ba45e372e1569b3
 -P d95f9fb713c7ba4e570556d835fbd77e574afdea 868394761e41b7483a5874426ee052dfb3a9e2be
 -R 14c36b139bb9a241f9fc5fc1fa96e28f
++P 64fc8b30f8bc7ddc697b6042040e958787ff3118 0733c98c329bc9942460746e9bbaf4b4c94c1520
++R 7c6a56a142b783bc5a39759c4e6db58f
+ U drh
 -Z 15a5058e7b3160b8bbe377cfe96ccfbc
++Z b8266c3b3b198b8b23ee6f1eee86b3bc

diff --cc manifest.uuid
index 714c488ce6a072eafb4064aaf73da2ff31dd5179,60c0fc890f70f67c5ebf913c035e4a5c2d4683ce..a81fab47bf54744626338fd6d6305782a54b186a
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 64fc8b30f8bc7ddc697b6042040e958787ff3118
 -0733c98c329bc9942460746e9bbaf4b4c94c1520
++66c4aaadda433c9d479a25c27cdff84560088402