Version 3.8.4 for sessions (plus two minor fixes).

FossilOrigin-Name: 917c410808756e1697bd628f4c9c57dd13d08ce7

diff --cc manifest
index ab6faa63a0e4836f3416373b42d9ff9e0bacf14e,37e199a7caf6df54a17af6700a1118547f16f8ca..4ba0f3868af18b179137fe2f3a2fd51ec19f3539
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Merge\sthe\sfix\sfor\sthe\sjournal_mode=PERSIST\serror\srecovery\sdelay\sbug.
- D 2014-03-07T14:36:50.554
 -C Adjustments\sto\sthe\scost\scomputation\sfor\sthe\sskip-scan\squery\splan,\sto\stake\ninto\saccount\sthe\sfact\sthat\sa\sseek\shas\sto\soccur\son\seach\sskip.
 -D 2014-03-10T20:12:31.746
++C Version\s3.8.4\sfor\ssessions\s(plus\stwo\sminor\sfixes).
++D 2014-03-11T01:48:06.461
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81
 +F Makefile.in e4ee6d36cdf6136aee0158675a3b24dd3bf31a5a
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 -F Makefile.msc fdacba6fb574868c71fde6db6b77789a383a4c19
 +F Makefile.msc b448317831d9c364bf501538becce5cc1f0a0f8b
  F Makefile.vxworks db21ed42a01d5740e656b16f92cb5d8d5e5dd315
  F README.md 64f270c43c38c46de749e419c22f0ae2f4499fe8
  F VERSION 0dc30ad5cf90736d5fd9e540c9f05c542658abe7
@@@ -286,17 -272,17 +286,17 @@@ F src/test_vfs.c e72f555ef7a59080f898fc
  F src/test_vfstrace.c 3a0ab304682fecbceb689e7d9b904211fde11d78
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
  F src/tokenize.c 6da2de6e12218ccb0aea5184b56727d011f4bee7
- F src/trigger.c a80036fcbd992729adc7cd34a875d59a71fa10cc
+ F src/trigger.c 66f3470b03b52b395e839155786966e3e037fddb
 -F src/update.c 5b3e74a03b3811e586b4f2b4cbd7c49f01c93115
 +F src/update.c 7bb549d61efc6853f5cc708c1de6931179f8a12d
  F src/utf.c 6dc9ec9f1b3db43ae8ba0365377f11df1ee4c01c
  F src/util.c c46c90459ef9bdc0c6c73803cf4c55425b4771cf
  F src/vacuum.c 3728d74919d4fb1356f9e9a13e27773db60b7179
 -F src/vdbe.c 5f0fffa9bf49a90c05dc3d46d8217603fd0ee00e
 -F src/vdbe.h fb2c48c198300a7c632f09fc940011d2ad2fc2ae
 -F src/vdbeInt.h e54fc4f289fce48e81b3371128446033d097733b
 -F src/vdbeapi.c 0ed6053f947edd0b30f64ce5aeb811872a3450a4
 -F src/vdbeaux.c e45e3f9daf38c5be3fd39e9aacc1c9066af57a06
 -F src/vdbeblob.c 15377abfb59251bccedd5a9c7d014a895f0c04aa
 +F src/vdbe.c a088d1688e6e0aeb69ffccb4ba740dfd77b44420
- F src/vdbe.h 6631430dddd1450dfe749ba6fa8e2acdda3933f6
++F src/vdbe.h e8e1219a7fd7395deb7a9824f9b7757d642fcf1a
 +F src/vdbeInt.h aa52feb8bfc05ea29ea262a9ce4050715c57ad5a
 +F src/vdbeapi.c d3c662762b62e330a03f29de8e2ac7098ef78030
 +F src/vdbeaux.c 1d0dad087b4d35ead04ebcc30e73ae7a172ad80f
- F src/vdbeblob.c 666ce6596264fe88dad51bf60c160668d3cd0920
++F src/vdbeblob.c 2d1f0fdb0f5b72118520980360a594b1c30cbdd8
  F src/vdbemem.c 6fc77594c60f6155404f3f8d71bf36d1fdeb4447
  F src/vdbesort.c 46801acb342e5e4c07ba1777fe58880c143abb59
  F src/vdbetrace.c 6f52bc0c51e144b7efdcfb2a8f771167a8816767
@@@ -1170,7 -1155,7 +1170,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
  F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
- P d389e20ab07a76d0c4be3801265977fa977a4394 1c318ef3b76e9a9a5ff2f156a9acddfc1bda0949
- R 11d40879c4a4163bd84e04c80c6b51aa
 -P 0a5318bc272b844e937cb1df3a07224034bc3450
 -R e70fe0ad6a94758a25d6a041a31ecb69
++P bb6a75f4bbcaaabc3ad47992c7c87868c70e8daf 0769eebd028ce31375cf93509a1d3687f7b117eb
++R 8317040a2b8c3959cbe620585e77d2ec
  U drh
- Z 5baca92522a934140dc6eba1ba109b11
 -Z 344f247bc956540503c85d9ccd8fecb9
++Z c65b275b0559950eeb5c7d0f4593078f

diff --cc manifest.uuid
index 0ae72b7d623857a75a3c56dcf80dde81747cb32e,ed97f1ebb6eb3cc74871e4466c9630ed5ba5c98c..2579e6cf13f0c19da65728e81289b360e346fe9b
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- bb6a75f4bbcaaabc3ad47992c7c87868c70e8daf
 -0769eebd028ce31375cf93509a1d3687f7b117eb
++917c410808756e1697bd628f4c9c57dd13d08ce7

diff --cc src/vdbe.h
Simple merge

diff --cc src/vdbeblob.c
Simple merge