Merge in the latest trunk changes.

FossilOrigin-Name: ca4708531a5e0debbe3d0999a4d210ef2a347972

diff --cc manifest
index f9aca85bef2438fc829f1aa87e2e190f61050994,804df3f20bfecc51e8c0068b1f84cc5202bd7cdc..39bbc2527491f0e65a5f827d607028c6d6802631
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\sfor\stest\sissues\swhen\sthere\sis\sno\scurrent\sdirectory\ssupport\sdue\sto\sbeing\scompiled\sfor\sWinRT.
- D 2012-03-06T03:00:49.815
 -C Fix\sa\sproblem\scompiling\sthe\stest\scode\sin\sfts3_test.c\swhen\sSQLITE_ENABLE_FTS3\sis\snot\sdefined.
 -D 2012-03-05T16:24:26.279
++C Merge\sin\sthe\slatest\strunk\schanges.
++D 2012-03-07T16:52:38.729
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 3f79a373e57c3b92dabf76f40b065e719d31ac34
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -854,7 -855,7 +855,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/trans.test 6e1b4c6a42dba31bd65f8fa5e61a2708e08ddde6
  F test/trans2.test d5337e61de45e66b1fcbf9db833fa8c82e624b22
  F test/trans3.test 373ac5183cc56be69f48ae44090e7f672939f732
@@@ -991,7 -992,7 +992,7 @@@ F tool/tostr.awk e75472c2f98dd76e06b8c9
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
  F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
- P 86c049a171acc3f4a43771f3e7176a90210d7799
- R 314d419e8c040139a13a4d217d38fb16
- U mistachkin
- Z 7d9d47d1c51b3cc8f2a457004146579d
 -P 99a9073b5e411ce94f38ce49608baaa15de8b850
 -R d0dc4635c0ac977f7342c0a0dac9e48b
 -U dan
 -Z d6573fd4e75425ab6ee13bee3b518e09
++P a811cb01528beab8afd899411d187d4d960ddcc8 b00ccda307caae597c143ab0586f90acb77f79cf
++R 94c51b7fbb263e5f4c52b0a46e76906b
++U drh
++Z b68dd77698ec2e059d1157847d82dd91

diff --cc manifest.uuid
index 72f995512aca6a7bacffc96cf044d2be32d5df06,dda6c5d4144f7aa95e27b4eb7b00807dd9bffbf6..8305724f2204c56ae77bea766490039ec4816658
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- a811cb01528beab8afd899411d187d4d960ddcc8
 -b00ccda307caae597c143ab0586f90acb77f79cf
++ca4708531a5e0debbe3d0999a4d210ef2a347972

diff --cc test/trace2.test
index 42738db3aa0f7db4361a894d8815a9592ddd0034,42738db3aa0f7db4361a894d8815a9592ddd0034..0e3130ec0018d713de9b917bdeda57b6ab3d4973
--- 1/test/trace2.test
--- 2/test/trace2.test
+++ b/test/trace2.test
@@@ -141,6 -141,6 +141,7 @@@ ifcapable fts3 
      INSERT INTO x1(x1) VALUES('optimize');
    } {
      "INSERT INTO x1(x1) VALUES('optimize');"
++    "-- SELECT DISTINCT level / (1024 * ?) FROM 'main'.'x1_segdir'"
      "-- SELECT idx, start_block, leaves_end_block, end_block, root FROM 'main'.'x1_segdir' WHERE level BETWEEN ? AND ?ORDER BY level DESC, idx ASC"
      "-- SELECT max(level) FROM 'main'.'x1_segdir' WHERE level BETWEEN ? AND ?"
      "-- SELECT coalesce((SELECT max(blockid) FROM 'main'.'x1_segments') + 1, 1)"