Merge the latest trunk changes into the sessions branch.

FossilOrigin-Name: 5efb02949dbeabccfe1d848d275529f03f3dfc84

diff --cc manifest
index 883ad2f5811dc0031168d7c600495013ea156d13,5c4f08aa37ce78e5dc5a4b831295e7179bb17f74..b3dd4e89faaf6389c68eb6591960152379c9eedf
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\slatest\schanges\sfrom\sthe\strunk\sinto\sthe\ssessions\sbranch.
- D 2011-09-14T19:41:44.795
 -C Remove\sunreachable\sbranches\sfrom\sthe\sprevious\schange.\s\sAdd\sadditional\ntest\scases.
 -D 2011-09-16T19:04:03.371
++C Merge\sthe\slatest\strunk\schanges\sinto\sthe\ssessions\sbranch.
++D 2011-09-16T19:40:24.719
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in d314143fa6be24828021d3f583ad37d9afdce505
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -144,8 -132,8 +144,8 @@@ F src/callback.c 0425c6320730e6d3981acf
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
  F src/ctime.c e3132ec65240b2e2f3d50831021eac387f27584d
  F src/date.c a3c6842bad7ae632281811de112a8ba63ff08ab3
 -F src/delete.c ff68e5ef23aee08c0ff528f699a19397ed8bbed8
 +F src/delete.c 614d6e012aa5b624e78f3b556243497825de196b
- F src/expr.c cbcd8c2f1588a9862291a081699854c5e1cb28ab
+ F src/expr.c fd54c517869919c9b0b11dcadd43c66540ffa682
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c 9f00ea98f6b360d477b5a78b5b59a1fbde82431c
  F src/func.c 59bb046d7e3df1ab512ac339ccb0a6f996a17cb7
@@@ -191,11 -179,11 +191,11 @@@ F src/printf.c 585a36b6a963df832cfb6950
  F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
  F src/resolve.c 36368f44569208fa074e61f4dd0b6c4fb60ca2b4
  F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
- F src/select.c bf7b7ea6befb483619da5f597b0864668b828c3c
+ F src/select.c d9b7d20b0365f80761846f00ef3638d4b33eeaf2
  F src/shell.c bbe7818ff5bc8614105ceb81ad67b8bdc0b671dd
 -F src/sqlite.h.in 0a6c9c23337fd1352c5c75a613ff9533aa7d91cb
 +F src/sqlite.h.in 355493ac9492746a0bbd17a4fd40911aa89b5a3a
  F src/sqlite3ext.h 1a1a4f784aa9c3b00edd287940197de52487cd93
- F src/sqliteInt.h 68a33c1d88051fae92a9528f198fbcaf3ddb3b39
 -F src/sqliteInt.h feb4f2b212fe36bbd951e44d2490c6aacf02f689
++F src/sqliteInt.h 2c05edf4b8155bf4ef0775a9c30e4b57d7527af3
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 7ac64842c86cec2fc1a1d0e5c16d3beb8ad332bf
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -250,12 -238,12 +250,12 @@@ F src/update.c 2d67e24d5a44d8b1c0839bf2
  F src/utf.c c53eb7404b3eb5c1cbb5655c6a7a0e0ce6bd50f0
  F src/util.c 06302ffd2b80408d4f6c7af71f7090e0cf8d8ff7
  F src/vacuum.c 05513dca036a1e7848fe18d5ed1265ac0b32365e
- F src/vdbe.c f03941d4126e2484a52652081a73f2e2e4d4eda1
- F src/vdbe.h a3308e58577f1586e4b0afb5e08b1fb6ac743d0d
 -F src/vdbe.c 60340bfb23f456ea0791cb28262a887363773371
 -F src/vdbe.h f0725ee997db869ecae5bb70a71612aabeca7755
 -F src/vdbeInt.h 693d6ac6810298fc6b4c503cfbe3f99a240f40af
 -F src/vdbeapi.c 11dc47987abacb76ad016dcf5abc0dc422482a98
 -F src/vdbeaux.c 49be7a5ce6a1b7df9ef5791133c3e4e6ab2a1ffe
 -F src/vdbeblob.c 32f2a4899d67f69634ea4dd93e3f651936d732cb
++F src/vdbe.c a4d43779fd31b00cc7c6e1717e4b6cfacf499e66
++F src/vdbe.h 226d4bc726b3597c35be155a4342db290601d67c
 +F src/vdbeInt.h 1400515b37a4863cdda4601abc0f76eca846c9f5
 +F src/vdbeapi.c c969d467817ca90f99f3d3b46d115fbec08aeb4c
- F src/vdbeaux.c b09cc16325b4faad109fb3e59d393019d1600e55
- F src/vdbeblob.c fde0374afb0c512614aed191ac2683f6772d2b8f
++F src/vdbeaux.c 61701754a1528451ddb6e55e9d353e35ea940492
++F src/vdbeblob.c 11248c6362389569764682eb0f59ce910f3cc381
  F src/vdbemem.c 5e6effb96dd53d233361cbfaa3f0a43b9af689e9
  F src/vdbesort.c 468d43c057063e54da4f1988b38b4f46d60e7790
  F src/vdbetrace.c 5d0dc3d5fd54878cc8d6d28eb41deb8d5885b114
@@@ -974,7 -962,7 +975,7 @@@ F tool/symbols.sh caaf6ccc7300fd4335331
  F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
  F tool/warnings.sh b7fdb2cc525f5ef4fa43c80e771636dd3690f9d2
- P eb036d6f81e15bac013316bf5b1b2ba3e0bd4605 3035dc1c7398791d550f4c02774ef7f961b4bb02
- R 807d1da65636d94548ad55811c85e6a7
- U dan
- Z e140cc97ae2304f1c705299d75477c59
 -P 0156f10e23daca0e2504cd293a67ed0233d254d0
 -R 6ac04cf9823838428848cb3eecc8467b
++P c00e45ede7cbf71a3a6d1ccad0b9275010ca8493 cf51ef8ab8a610ddf64f66970dd689fe1df405b8
++R 8f9c10e95fc4061078755c289f7e07d0
+ U drh
 -Z fc85b6ee205b1fa04072a560842933fc
++Z 423f374ece1297d22d3fad8417996b4a

diff --cc manifest.uuid
index 39610efda7fc6c617ad4ac13e73adffc2742b11f,b05ad8b2ae8ebf403888a4234a570d145cffcac2..a912068f8e70f3a6113ea8dec6a05cd808e77a05
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- c00e45ede7cbf71a3a6d1ccad0b9275010ca8493
 -cf51ef8ab8a610ddf64f66970dd689fe1df405b8
++5efb02949dbeabccfe1d848d275529f03f3dfc84

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc src/vdbe.h
Simple merge

diff --cc src/vdbeaux.c
Simple merge

diff --cc src/vdbeblob.c
Simple merge