Merge in the latest changes from trunk.

FossilOrigin-Name: 0d99229a7a58da07748072326f6261c533c1958f

diff --cc manifest
index 6eb669650b3869ded123c3f2db17b8fef599f575,927bd9ef711833b35b3b51e82f80f1fbd6af4f02..0c5e0af6347b089343c31f12282990fd574be0a3
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C When\sresetting\sany\snon-TEMP\sschema,\salso\sreset\sthe\sTEMP\sschema\ssince\sit\smight\nbe\sholding\sreferences\sto\sthe\snon-TEMP\sschema\sthat\sjust\sgot\sreset.
- D 2011-04-02T16:50:25.018
 -C Change\sthe\sname\sof\sthe\s"tAttachMask"\sdatatype\sto\s"yDbMask".
 -D 2011-04-02T20:01:02.621
++C Merge\sin\sthe\slatest\schanges\sfrom\strunk.
++D 2011-04-02T20:08:10.095
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 7a4d9524721d40ef9ee26f93f9bd6a51dba106f2
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -124,7 -124,7 +124,7 @@@ F src/btmutex.c 96a12f50f7a17475155971a
  F src/btree.c 2b9c81ff64da339a67dda4f94c0d763627be0b67
  F src/btree.h 8d36f774ec4b1d0027b8966f8c03d9a72a518c14
  F src/btreeInt.h 20f73dc93b1eeb83afd7259fbc6bd7dcf2df7fe4
- F src/build.c fcdd8f47361261432fb10d0e7234ba617025d1f2
 -F src/build.c 3a8c6c4b1e16798755d46e699b7fcc12b9f27b2b
++F src/build.c 0dd1fd5a9d38534e99d7ed70c325647917e571c5
  F src/callback.c 5069f224882cbdccd559f591271d28d7f37745bc
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
  F src/ctime.c 52ff72f966cee3087e0138a3ec69371c22be3c01
@@@ -234,12 -234,12 +234,12 @@@ F src/trigger.c ec4813709e990a169b69232
  F src/update.c 81911be16ece3c3e7716aa18565b4814ec41f8b9
  F src/utf.c d83650c3ea08f7407bd9d0839d9885241c209c60
  F src/util.c cd997077bad039efc0597eb027c929658f93c018
 -F src/vacuum.c 924bd1bcee2dfb05376f79845bd3b4cec7b54b2f
 -F src/vdbe.c a45a6a0daf2161797d50b3b5b8a3e0e4debf2d2b
 +F src/vacuum.c 3b2b0998f4f277e4bc61469c2d78d8424d02899b
 +F src/vdbe.c 6b15a8fb9bb5d5abd232fbc72cc6410c2fd70c1b
  F src/vdbe.h 4de0efb4b0fdaaa900cf419b35c458933ef1c6d2
- F src/vdbeInt.h e1c6254641168507d25b46affb6dfb53c782f553
+ F src/vdbeInt.h 8ee9302ecc1036509956df8aceea6b0b5e0e231c
  F src/vdbeapi.c a09ad9164cafc505250d5dd6b69660c960f1308c
- F src/vdbeaux.c e97565fb2fea822a2e853370c440b493ef09d7e7
 -F src/vdbeaux.c 80ed78c8e1edf8918e0e404891d314aa01ccb095
++F src/vdbeaux.c f4b4a7dce084fbe49f6ba761f4ce42e732eb95b1
  F src/vdbeblob.c c3ccb7c8732858c680f442932e66ad06bb036562
  F src/vdbemem.c 0498796b6ffbe45e32960d6a1f5adfb6e419883b
  F src/vdbetrace.c 3ba13bc32bdf16d2bdea523245fd16736bed67b5
@@@ -926,7 -926,7 +926,7 @@@ F tool/speedtest8.c 2902c46588c40b55661
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- P 6a8ad6e31e0d2b8a5ace38faf0efd805155ee5f3
- R bc8973ff15cc98898e96282e6b2f93e3
 -P 3b91eaaa0b3c25022332ba3d1a5651848fc5d84c
 -R e5d6d2ab5437a135179f043b3faf09c4
++P 211d5dde1f9c15048c65d1d700141aa7b2491011 3d6f2e82358c0d8c0ca04e0da20b84fc65c3f7fa
++R 290acaeec121836b8a1b99b53f8bb8b6
  U drh
- Z af325c6ab15f4448779a96c9a9fe8dd3
 -Z cdbe2872c525d3ae3a361db4be775f20
++Z 38fca8897a28d9359be9824575889a08

diff --cc manifest.uuid
index d2609b2f9d88109e4b23e4d57e4b633244ab2f8f,6c4bffcf25e3bfd88a6fc4898215a5588f6222e8..7a9e90a4e4a4cf59b823a22b5f2a77d1477ecef8
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 211d5dde1f9c15048c65d1d700141aa7b2491011
 -3d6f2e82358c0d8c0ca04e0da20b84fc65c3f7fa
++0d99229a7a58da07748072326f6261c533c1958f

diff --cc src/build.c
Simple merge

diff --cc src/vdbeaux.c
Simple merge