Merge all recent trunk changes into the sessions branch.

FossilOrigin-Name: ae6c4a0906ad8caabd8c605bb39c5fb979ab39a2

diff --cc manifest
index 08e704d66ef0cf40247e3fcd32509ff2a6792e67,e9fbbc3ca634babb572a80af33b2a24174f5ad54..03c59fadef5df2f089c43e69323b9e9ba7b51994
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,12 -1,12 +1,12 @@@
 -C Fix\sa\scouple\sof\sharmless\scompiler\swarnings\sin\sthe\sfts3_tokenize\svirtual\ntable.
 -D 2013-05-08T17:06:28.377
 +C Merge\sall\srecent\strunk\schanges\sinto\sthe\ssessions\sbranch.
- D 2013-05-03T18:29:22.159
++D 2013-05-08T18:50:04.870
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in ce81671efd6223d19d4c8c6b88ac2c4134427111
 +F Makefile.in e2acdd75b30e5f2fd8739c923c746d9d2228fe9a
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 -F Makefile.msc 8f4ee0dab220a5276d5da61149dfd6cd5d1dd5b8
 +F Makefile.msc af9891d1f609607a54524f4ccabcbe5c38e4a8e3
  F Makefile.vxworks db21ed42a01d5740e656b16f92cb5d8d5e5dd315
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
 -F VERSION 05c7bd63b96f31cfdef5c766ed91307ac121f5aa
 +F VERSION 0dee4d2e0c64791ff0085277424fb5c07d79fc9a
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F addopcodes.awk 17dc593f791f874d2c23a0f9360850ded0286531
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
@@@ -110,22 -110,10 +110,22 @@@ F ext/rtree/rtree_util.tcl 06aab2ed5b82
  F ext/rtree/sqlite3rtree.h c34c1e41d1ab80bb8ad09aae402c9c956871a765
  F ext/rtree/tkt3363.test 142ab96eded44a3615ec79fba98c7bde7d0f96de
  F ext/rtree/viewrtree.tcl eea6224b3553599ae665b239bd827e182b466024
 +F ext/session/session1.test 502086908e4144dfaccb1baa77bc29d75a9daace
 +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/session_common.tcl 1539d8973b2aea0025c133eb0cc4c89fcef541a5
 +F ext/session/sessionfault.test 496291b287ba3c0b14ca2e074425e29cc92a64a6
 +F ext/session/sqlite3session.c 7d7ca693bd581243835ee47b41b491bd909a26f4
 +F ext/session/sqlite3session.h f374c9c4c96e08f67ac418871c29d423245c7673
 +F ext/session/test_session.c ea4dc9b4a1895c8e6bddcbfe3838d7eb57df2d99
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
- F magic.txt 291863ca976425e2e7bf3f775eb98ece4dd120f6
+ F magic.txt 3f820e18c43504b25da40ff4b4cdb66dc4c4907e
 -F main.mk 1b25be82452366abc27cc9ab2acf3244a773d5a1
 +F main.mk 06e980ed70c3fa4c27c35ff38735af6e05a64304
  F mkdll.sh 7d09b23c05d56532e9d44a50868eb4b12ff4f74a
  F mkextu.sh 416f9b7089d80e5590a29692c9d9280a10dbad9f
  F mkextw.sh 4123480947681d9b434a5e7b1ee08135abe409ac
@@@ -202,12 -190,12 +202,12 @@@ F src/printf.c 4a9f882f1c1787a8b494a298
  F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
  F src/resolve.c 83cc2d942ee216bc56956c6e6fadb691c1727fa1
  F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0
- F src/select.c 6bfbe11e2fef81c5e18d30513ab6c69f171667eb
- F src/shell.c 5d527e5d08f05ec2c43ff194ea44bf62b974f4c9
+ F src/select.c a4641882279becc200f2680f55f3e89d4e7c7f78
+ F src/shell.c 2109d54f67c815a100abd7dc6a6e25eddb3b97eb
 -F src/sqlite.h.in 5a5a22a9b192d81a9e5dee00274e3a0484c4afb1
 +F src/sqlite.h.in 3b9c6d8e5b3b93e39c266c9534369042c14e9a31
  F src/sqlite3.rc fea433eb0a59f4c9393c8e6d76a6e2596b1fe0c0
  F src/sqlite3ext.h d936f797812c28b81b26ed18345baf8db28a21a5
 -F src/sqliteInt.h de835c584032769461c123a564381f9808542c0e
 +F src/sqliteInt.h 4b768ec538d5ed20f5ca0196a25c2c029b8513cb
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c bedc37ec1a6bb9399944024d63f4c769971955a9
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -259,7 -247,7 +259,7 @@@ F src/test_vfstrace.c 34b544e80ba7fb77b
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
  F src/tokenize.c 1e86210d3976717a19238ea7b047fac481fe8c12
  F src/trigger.c cd95ac64efa60e39faf9b5597443192ff27a22fa
- F src/update.c beef58f5fd66153ac9cdf6e9f6551f09ee68976c
 -F src/update.c 4c0c6864c4349ba292042e984a56d15985b57f4e
++F src/update.c 2f6de22ac39150695b2219194ad47c9b6a211032
  F src/utf.c 8d819e2e5104a430fc2005f018db14347c95a38f
  F src/util.c f566b5138099a2df8533b190d0dcc74b7dfbe0c9
  F src/vacuum.c ddf21cc9577c4cb459d08bee9863a78ec000c5bb
@@@ -739,8 -727,8 +739,9 @@@ F test/selectA.test 99cf21df033b93033ea
  F test/selectB.test 954e4e49cf1f896d61794e440669e03a27ceea25
  F test/selectC.test 871fb55d884d3de5943c4057ebd22c2459e71977
  F test/selectD.test b0f02a04ef7737decb24e08be2c39b9664b43394
+ F test/selectE.test fc02a1eb04c8eb537091482644b7d778ae8759b7
  F test/server1.test 46803bd3fe8b99b30dbc5ff38ffc756f5c13a118
 +F test/session.test c1a17c11ef7d01c24fe2b9f7871190d949a8e718
  F test/shared.test 1da9dbad400cee0d93f252ccf76e1ae007a63746
  F test/shared2.test 03eb4a8d372e290107d34b6ce1809919a698e879
  F test/shared3.test ebf77f023f4bdaa8f74f65822b559e86ce5c6257
@@@ -1074,7 -1062,7 +1075,7 @@@ F tool/vdbe-compress.tcl f12c884766bd14
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
  F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
- P 6994826c0784280f2e9728dfa4185848846d03df b2efe4f225adc5f4c2e3080bf459cc52fff82e18
- R 70853c32af7db548acc44e4c7931cc60
 -P ce853a75068073d6acc8bec0819505a22c4c7e69
 -R 693e66fc26b30225620a1dd87e0b79b3
++P 3879ab1b532828fcc12a50a95b6730faebcb69e9 1fa8c457394c94864f7584e4c893ec09e685fba4
++R 6dca9a7ba655003e260761c816386ff9
  U drh
- Z ccdd14f93f4b60d77de88619ca7032d3
 -Z a746215c07dfe5ad61be18a3c8d6b29d
++Z e98b12eb9b44f51c72b4bf508d55e95c

diff --cc manifest.uuid
index 6d8df55db28023e6feca28b534d9c8e415798122,00a6e72965d782c8063fb7030b3bef60a0cfaf55..aac6aef4409519932aca810d8f1fe4a104cf0edf
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 3879ab1b532828fcc12a50a95b6730faebcb69e9
 -1fa8c457394c94864f7584e4c893ec09e685fba4
++ae6c4a0906ad8caabd8c605bb39c5fb979ab39a2

diff --cc src/update.c
Simple merge