Merge the latest trunk enhancements into the sessions branch.

FossilOrigin-Name: a5d94eaba6aa12ff16d2a0af2fc752bcdb461877

diff --cc Makefile.in
Simple merge

diff --cc Makefile.msc
Simple merge

diff --cc main.mk
Simple merge

diff --cc manifest
index 2822363061f3c913485ba73cee6c463a44d162ad,d5d65422e575fcc00e0730141cb1229b297ab9c3..f734f7ed3e3a1635b52243af0d5ba05d837aa3a8
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,12 -1,12 +1,12 @@@
- C Merge\sthe\s3.8.5\srelease\scandidate\schanges\sinto\sthe\ssessions\sbranch.
- D 2014-06-03T20:09:48.914
 -C Bump\sthe\sversion\snumber\sto\s3.8.6.
 -D 2014-06-30T19:28:57.595
++C Merge\sthe\slatest\strunk\senhancements\sinto\sthe\ssessions\sbranch.
++D 2014-06-30T20:02:55.053
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in faf03dca4bd103f3e98b317aeba930dea49cfaa1
 -F Makefile.in 1732320ecac3fee229d560d7ef2afa34681d1815
++F Makefile.in cdca3064ff319e7ef34eaf20bc32429e30903f48
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc ac23895c1c2928518fa729b3b71bc30a6ab19347
 -F Makefile.msc ad60c4d8be35f98fdcca614088b84a91612b2b4c
++F Makefile.msc 91ddfb80ab8afc6d5bd9145d82e52e800f29acf5
  F Makefile.vxworks 034289efa9d591b04b1a73598623119c306cbba0
  F README.md 64f270c43c38c46de749e419c22f0ae2f4499fe8
- F VERSION 9f823c026c6a32fc5f84d212a8aae0a221dba45c
+ F VERSION 1c877615a9db323e3cd301e3d57d853f9d5c4a07
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F addopcodes.awk 9eb448a552d5c0185cf62c463f9c173cedae3811
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
@@@ -141,24 -143,10 +143,24 @@@ F ext/rtree/rtree_util.tcl 06aab2ed5b82
  F ext/rtree/sqlite3rtree.h 83349d519fe5f518b3ea025d18dd1fe51b1684bd
  F ext/rtree/tkt3363.test 142ab96eded44a3615ec79fba98c7bde7d0f96de
  F ext/rtree/viewrtree.tcl eea6224b3553599ae665b239bd827e182b466024
 +F ext/session/session1.test 894e3bc9f497c4fa07a2aa3271e3911f3670c3d8
 +F ext/session/session2.test 99ca0da7ddb617d42bafd83adccf99f18ae0384b
 +F ext/session/session3.test a7a9ce59b8d1e49e2cc23d81421ac485be0eea01
 +F ext/session/session4.test a6ed685da7a5293c5d6f99855bcf41dbc352ca84
 +F ext/session/session5.test 8fdfaf9dba28a2f1c6b89b06168bdab1fef2d478
 +F ext/session/session6.test 443789bc2fca12e4f7075cf692c60b8a2bea1a26
 +F ext/session/session8.test 7d35947ad329b8966f095d34f9617a9eff52dc65
 +F ext/session/session9.test 776e46785c29c11cda01f5205d0f1e8f8f9a46bf
 +F ext/session/sessionA.test eb05c13e4ef1ca8046a3a6dbf2d5f6f5b04a11d4
 +F ext/session/session_common.tcl 1539d8973b2aea0025c133eb0cc4c89fcef541a5
 +F ext/session/sessionfault.test 496291b287ba3c0b14ca2e074425e29cc92a64a6
 +F ext/session/sqlite3session.c 34e19186d05d534e5a37a4f5a8a3c3e24e3fa88a
 +F ext/session/sqlite3session.h 6c35057241567ed6319f750ee504a81c459225e1
 +F ext/session/test_session.c 7878ac0e2fe9675e8ec24d54f6a538ccc105977f
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
- F magic.txt f439556c5ce01ced70987e5ee86549a45165d9ff
- F main.mk 341301be4e8956ad69be7c962e1120b85c0b4a1d
+ F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
 -F main.mk 7850d834ca7f3c772e2b0087631868d5bfdeabb9
++F main.mk cd6daae5f386acaf508b63dd9888018602f50da8
  F mkopcodec.awk c2ff431854d702cdd2d779c9c0d1f58fa16fa4ea
  F mkopcodeh.awk c6b3fa301db6ef7ac916b14c60868aeaec1337b5
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
@@@ -187,11 -175,11 +189,11 @@@ F src/callback.c 174e3c8656bc29f91d710a
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
  F src/ctime.c 0231df905e2c4abba4483ee18ffc05adc321df2a
  F src/date.c 593c744b2623971e45affd0bde347631bdfa4625
 -F src/delete.c bcf8f72126cea80fc3d5bc5494cf19b3f8935aaf
 +F src/delete.c 50b74c1dde25d1ebcb4fa5c870762e6470ee46f1
- F src/expr.c 4f9e497c66e2f25a4d139357a778c84d5713207c
+ F src/expr.c 40d06d1543b1355aa02efa9666178f7642a96ed6
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c a549cff9fe8b736cdae21650ea0af6de29b77619
- F src/func.c 2e16316ec3a6365a0dc3e553c586f91b20f7f6c8
+ F src/func.c 3bc223ea36cd29a91c481485343d0ee4257ab8dc
  F src/global.c 1e4bd956dc2f608f87d2a929abc4a20db65f30e4
  F src/hash.c d139319967164f139c8d1bb8a11b14db9c4ba3cd
  F src/hash.h 8890a25af81fb85a9ad7790d32eedab4b994da22
@@@ -201,7 -189,7 +203,7 @@@ F src/journal.c b4124532212b6952f42eb2c
  F src/legacy.c 0df0b1550b9cc1f58229644735e317ac89131f12
  F src/lempar.c cdf0a000315332fc9b50b62f3b5e22e080a0952b
  F src/loadext.c 867c7b330b740c6c917af9956b13b81d0a048303
- F src/main.c 887077056c8a20bf2880a27096d7a40630f6257a
 -F src/main.c 7c2c3cafdd6313c8f9319ebec1565782e624372e
++F src/main.c 13f3dcd2037ea5891e2c83a87f29872a50d5ab79
  F src/malloc.c 0203ebce9152c6a0e5de520140b8ba65187350be
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c c0c990fcaddff810ea277b4fb5d9138603dd5d4b
@@@ -232,19 -220,19 +234,19 @@@ F src/pragma.c 810ef31ccfaa233201dcf100
  F src/prepare.c 677521ab7132615a8a26107a1d1c3132f44ae337
  F src/printf.c af06f66927919730f03479fed6ae9854f73419f4
  F src/random.c d10c1f85b6709ca97278428fd5db5bbb9c74eece
- F src/resolve.c 273d5f47c4e2c05b2d3d2bffeda939551ab59e66
+ F src/resolve.c 5fc110baeacf120a73fe34e103f052632ff11a02
  F src/rowset.c a9c9aae3234b44a6d7c6f5a3cadf90dce1e627be
  F src/select.c 6762c62e11b504aa014edceab8886495165e3a77
- F src/shell.c 98ce7f52445aa0c2eac3d4553a4cdcbb6402a670
+ F src/shell.c 56de2dfa3f25def4bf03098f7e2256fbb42f6e3c
 -F src/sqlite.h.in a98eb3e8c86c934ea6f5bcfc6b69653dde2f4ed4
 +F src/sqlite.h.in a585e10c0d181b0f102df93477cfd3ab2b98b2e5
  F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e
  F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
- F src/sqliteInt.h b9260ccf4c1ca2e26bc0789597c0a132aad4961b
 -F src/sqliteInt.h e88614d7371b80ff69dbbb5e4b9813ee93dfd890
++F src/sqliteInt.h 19dc37674323885ba5b6be808d711253a7b027ae
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
 -F src/tclsqlite.c e87c99e28a145943666b51b212dacae35fcea0bd
 +F src/tclsqlite.c 7ada527ce7916adcabad7997c10f09680aac7c9b
- F src/test1.c 4edf8810c86d77ae7ac6d56d563965a9beeea2ce
+ F src/test1.c 3c8bc491d2f8de5adbbf306533cefc343c733927
  F src/test2.c 98049e51a17dc62606a99a9eb95ee477f9996712
  F src/test3.c 1c0e5d6f080b8e33c1ce8b3078e7013fdbcd560c
  F src/test4.c 9b32d22f5f150abe23c1830e2057c4037c45b3df
@@@ -291,17 -279,17 +293,17 @@@ F src/test_vfstrace.c bab9594adc976cbe6
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
  F src/tokenize.c 6da2de6e12218ccb0aea5184b56727d011f4bee7
  F src/trigger.c 66f3470b03b52b395e839155786966e3e037fddb
 -F src/update.c 01564b3c430f6c7b0a35afaf7aba7987206fa3a5
 +F src/update.c 0f16e1d55d642a7ae3199bd0c2c1f51a7ef1b9d4
- F src/utf.c 6dc9ec9f1b3db43ae8ba0365377f11df1ee4c01c
+ F src/utf.c a0314e637768a030e6e84a957d0c4f6ba910cc05
  F src/util.c 049fe1d3c0e2209c1bee107aec2fcff6285f909f
  F src/vacuum.c 3728d74919d4fb1356f9e9a13e27773db60b7179
 -F src/vdbe.c 9bfe6becfc094382ae213656fbe511055ad83a54
 -F src/vdbe.h c63fad052c9e7388d551e556e119c0bcf6bebdf8
 -F src/vdbeInt.h 5df5e9afe9b7839cd17256220fc4f7af84b8b1cd
 -F src/vdbeapi.c 0ed6053f947edd0b30f64ce5aeb811872a3450a4
 -F src/vdbeaux.c 8ce7dcdbb8c59e5c2194518ce3099b254ae94c15
 -F src/vdbeblob.c 9205ce9d3b064d9600f8418a897fc88b5687d9ac
 +F src/vdbe.c 62f985592bfa011c2b35f8d7bfb4d4090340ae40
- F src/vdbe.h d03fcf47890ae1c79a335ca994cb878b302697ca
- F src/vdbeInt.h c05d4572211384c560b7579e7a299248cf31d6bd
++F src/vdbe.h ca3b6df299adce6e2f499c57e42ae54f142ae823
++F src/vdbeInt.h 3c295f4466f4b8a7f4b9b126d20bbbb21c38011f
 +F src/vdbeapi.c d3c662762b62e330a03f29de8e2ac7098ef78030
- F src/vdbeaux.c e0c2e24ee12c94b6d7cb1c521a0b26cd2e3231d9
++F src/vdbeaux.c 36eb94ea73e470ffcfec401043d8c2fc7359be98
 +F src/vdbeblob.c d7c232d1c6afc7ee1176c38b7d81b2e17af15ceb
- F src/vdbemem.c 6fc77594c60f6155404f3f8d71bf36d1fdeb4447
+ F src/vdbemem.c d90a1e8acf8b63dc9d14cbbea12bfec6cec31394
  F src/vdbesort.c 44441d73b08b3a638dcdb725afffb87c6574ad27
  F src/vdbetrace.c 6f52bc0c51e144b7efdcfb2a8f771167a8816767
  F src/vtab.c 21b932841e51ebd7d075e2d0ad1415dce8d2d5fd
@@@ -1188,7 -1182,7 +1197,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 9f18e78f039ffa89a8806810ad385bdc51bc88ed 6d81805298ea882f5fee99504d5a95f1a762a90b
- R 1b537fdde3fe5617547753819824a8f7
 -P d09ca6d5efad3e4cfa93a4dc711e6ba6079d4b4b
 -R 0b9fd011a99704759c36a48aebd29593
++P 09e75d82d02f900e58eceaaa010a42fc7044c89f f925e9baafea625f63105f8013abb3807b418379
++R 479d9c5a6e74a479850ba5a90b6bb579
  U drh
- Z 60e68d7eb2611275d6e02a10bd056454
 -Z 99f7c1257c18120424d63d4c4b9a073c
++Z 79686a893dbf1703dda2bbbc832594c3

diff --cc manifest.uuid
index 8f7efb767ec6524085dbc277675d86365e7383c1,708593f343348243d3958667794f0014fea6a807..9bf239800012edf73ffbf054f3739e6b3fe86b14
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 09e75d82d02f900e58eceaaa010a42fc7044c89f
 -f925e9baafea625f63105f8013abb3807b418379
++a5d94eaba6aa12ff16d2a0af2fc752bcdb461877

diff --cc src/main.c
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/vdbe.h
Simple merge

diff --cc src/vdbeInt.h
Simple merge

diff --cc src/vdbeaux.c
Simple merge