Merge latest trunk changes.

FossilOrigin-Name: 11ea98e454ad35b2606e81dec9ac866e4dd9f7e1

diff --cc manifest
index ed26c9da132ee77ffb5f5688eb38bd31e7c0e175,c7349038304efd3ea7fa09aed1a81cbd88c9508d..5cd1fbd7ca7a496ca3ca71bb1826de5de399f5bd
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Remove\san\sunnecessary\sassignment\sfrom\svdbeapi.c.
- D 2011-06-27T19:12:57.742
 -C Add\sa\scase\sto\spermutations.test\sto\srun\sthe\sveryquick\stest\ssuite\susing\ssqlite3_prepare()\sinstead\sof\ssqlite3_prepare_v2().\sThis\shelps\sto\stest\sthe\sfix\sfor\sbug\s[25ee812710].
 -D 2011-06-27T16:55:50.495
++C Merge\slatest\strunk\schanges.
++D 2011-06-27T19:25:10.603
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in c1d7a7f4fd8da6b1815032efca950e3d5125407e
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -241,8 -241,8 +241,8 @@@ F src/vacuum.c 05513dca036a1e7848fe18d5
  F src/vdbe.c 50b5b4ef29d928a4f60905f820ee1ab2f8ced29f
  F src/vdbe.h 5cf09e7ee8a3f7d93bc51f196a96550786afe7a1
  F src/vdbeInt.h ad84226cc0adcb1185c22b70696b235a1678bb45
 -F src/vdbeapi.c 2f908c65337b16c6249ab378d477e74492cf759b
 +F src/vdbeapi.c 11dc47987abacb76ad016dcf5abc0dc422482a98
- F src/vdbeaux.c 0b2e2880f13af400a27c92a7673287c3eaec8b21
+ F src/vdbeaux.c 4d100407e3c72e163854aff8903d19d5ecdf46c0
  F src/vdbeblob.c f024f0bf420f36b070143c32b15cc7287341ffd3
  F src/vdbemem.c 0498796b6ffbe45e32960d6a1f5adfb6e419883b
  F src/vdbetrace.c 5d0dc3d5fd54878cc8d6d28eb41deb8d5885b114
@@@ -948,8 -948,8 +948,8 @@@ F tool/split-sqlite3c.tcl d9be87f1c3402
  F tool/symbols.sh bc2a3709940d47c8ac8e0a1fdf17ec801f015a00
  F tool/tostr.awk 11760e1b94a5d3dcd42378f3cc18544c06cfa576
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- F tool/warnings.sh 347d974d143cf132f953b565fbc03026f19fcb4d
- P 2c4bbd90e2fca593c186bf412b608aff8c9f9061
- R 2d15c61ad82393e3871d39f558fa91b1
+ F tool/warnings.sh 2ebae31e1eb352696f3c2f7706a34c084b28c262
 -P faa38c8724d3eebad97197bfa44d11e75cfe6c69
 -R ea65f158609dffa4f41c8ce1eb564414
++P 25e5b7686a06e7f4ee993d8559d23143e2e8c7a8 d9f7993bfa2ecb30c44455de538eb6f8a4a59087
++R d90c56f8c8c73b3d354275ed6655034c
  U dan
- Z 368095b2328022a768848f2679ec1079
 -Z 2df66e3ffb41532c6826925a7e3446a4
++Z 93900890f23a5f1f420e0f052b3cd95b

diff --cc manifest.uuid
index 0475acf58bd5c549e3b28c6f392f6c3d57ed25a0,4cd588aa865d08b584615505fc0a6858b9f833a3..024ad843d7401a5ba5246563b6a21b7ff61517f3
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 25e5b7686a06e7f4ee993d8559d23143e2e8c7a8
 -d9f7993bfa2ecb30c44455de538eb6f8a4a59087
++11ea98e454ad35b2606e81dec9ac866e4dd9f7e1