Merge latest trunk changes.

FossilOrigin-Name: d184cf00574b52b93f1f089025d6a0addca57558

diff --cc manifest
index 8e4d946b71d42073afc447e6a1250055279f441c,179b8e01d25448329ee357896bfe1d20d92a3268..081ea45a189e296f0b4bd5ec28d806ccdba05f42
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C If\sthe\ssessions\smodule\sis\sbeing\sbuilt\sas\spart\sof\sthe\samalgamation,\sdo\snot\stry\sto\sinclude\ssqliteInt.h\sand\svdbeInt.h.
- D 2011-04-01T15:30:39.770
 -C Ensure\sthat\sit\sis\snot\spossible\sto\sadd\sa\scolumn\sto\sa\ssystem\stable\susing\sALTER\sTABLE.
 -D 2011-04-01T15:15:58.380
++C Merge\slatest\strunk\schanges.
++D 2011-04-01T15:43:40.999
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 27701a1653595a1f2187dc61c8117e00a6c1d50f
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -193,8 -184,8 +193,8 @@@ F src/sqliteInt.h 14325fe41ee564f064ada
  F src/sqliteLimit.h a17dcd3fb775d63b64a43a55c54cb282f9726f44
  F src/status.c 4997380fbb915426fef9e500b4872e79c99267fc
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
 -F src/tclsqlite.c b020ebf3b4af58cae7875e217efd7ac22f485713
 +F src/tclsqlite.c 8376ae45f7e28d521ad708a0086771fab3c96475
- F src/test1.c 9020310c7617234b33fd1c3064f89524db25f290
+ F src/test1.c 9ca440e80e16e53920904a0a5ac7feffb9b2c9a1
  F src/test2.c 80d323d11e909cf0eb1b6fbb4ac22276483bcf31
  F src/test3.c 056093cfef69ff4227a6bdb9108564dc7f45e4bc
  F src/test4.c 0528360b5025688002a5feb6be906ddce52eaaee
@@@ -241,11 -232,11 +241,11 @@@ F src/update.c 3f3f3bb734a0da1dffd0ed33
  F src/utf.c d83650c3ea08f7407bd9d0839d9885241c209c60
  F src/util.c cd997077bad039efc0597eb027c929658f93c018
  F src/vacuum.c 924bd1bcee2dfb05376f79845bd3b4cec7b54b2f
 -F src/vdbe.c e3f37ca0afdd72e883475e2a32a06167df2810d0
 -F src/vdbe.h 4de0efb4b0fdaaa900cf419b35c458933ef1c6d2
 -F src/vdbeInt.h e1c6254641168507d25b46affb6dfb53c782f553
 -F src/vdbeapi.c a09ad9164cafc505250d5dd6b69660c960f1308c
 -F src/vdbeaux.c 77921792f7ebae267490816deb6a9488f938fa85
 +F src/vdbe.c 4784ded3d2c97f8084a17cacbeea490a0dccf75e
 +F src/vdbe.h edef9c4f0be83e1f1dccd049da37b40e021b63d9
 +F src/vdbeInt.h b6748a8ac9be169d83585a0f5daf747863c6b8db
 +F src/vdbeapi.c 7ef519083e3420bf7793d8b4eae2961d894d98ab
- F src/vdbeaux.c b526e30d7a5d5b8b18408b2ec077e7286df2f6dc
++F src/vdbeaux.c 0dcfffca621c534d8c64abfc47888dca5dd7b809
  F src/vdbeblob.c c3ccb7c8732858c680f442932e66ad06bb036562
  F src/vdbemem.c 0498796b6ffbe45e32960d6a1f5adfb6e419883b
  F src/vdbetrace.c 3ba13bc32bdf16d2bdea523245fd16736bed67b5
@@@ -682,11 -673,11 +683,11 @@@ F test/subselect.test d24fd8757daf97daf
  F test/substr.test 18f57c4ca8a598805c4d64e304c418734d843c1a
  F test/superlock.test 5d7a4954b0059c903f82c7b67867bc5451a7c082
  F test/sync.test ded6b39d8d8ca3c0c5518516c6371b3316d3e3a3
- F test/syscall.test 125d9781d914c408e8629053b5f914dc920ab3eb
- F test/sysfault.test be42aa42f89a82305cf3807047d419595e430480
+ F test/syscall.test d1dae1fee88613cf763d97ad0038d867509e0c42
+ F test/sysfault.test c79441d88d23696fbec7b147dba98d42a04f523f
  F test/table.test 04ba066432430657712d167ebf28080fe878d305
  F test/tableapi.test 2674633fa95d80da917571ebdd759a14d9819126
 -F test/tclsqlite.test 8c154101e704170c2be10f137a5499ac2c6da8d3
 +F test/tclsqlite.test 1ce9b6340d6d412420634e129a2e3722c651056a
  F test/tempdb.test 19d0f66e2e3eeffd68661a11c83ba5e6ace9128c
  F test/temptable.test f42121a0d29a62f00f93274464164177ab1cc24a
  F test/temptrigger.test b0273db072ce5f37cf19140ceb1f0d524bbe9f05
@@@ -929,7 -921,7 +931,7 @@@ F tool/speedtest2.tcl ee2149167303ba8e9
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- P 6634521461e6acff7cc778590e62d57831f9230d
- R 7a473314ef2d0233cdf9f16418e4fb53
 -P 7e237aea22084416d02b89d5223de4e1ca76882d
 -R 68179f8f20bd7e83c0daf30e8b4b7cff
++P f87bfe6e12093e5958b658a49d3766fb29562cbb d9707ef8dcd29667b6d366897f6ad02c87aa0041
++R e5326ee14e908456b763c8934a17defb
  U dan
- Z 1c0b7044d6d9a7b111c49878de940801
 -Z 07da6539f8d6e81dde928bab49d2b3fe
++Z 5580ee572f02ed202a1934709ea63a74

diff --cc manifest.uuid
index 7f5424aa6274dcd688f0f9bc829376572a418f48,e4175092faec81c5fe5552cc6f538e6963facc81..da86ff7b09868a3f81a8f96b1972fa7973fee5ba
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- f87bfe6e12093e5958b658a49d3766fb29562cbb
 -d9707ef8dcd29667b6d366897f6ad02c87aa0041
++d184cf00574b52b93f1f089025d6a0addca57558

diff --cc src/vdbeaux.c
Simple merge