Pull all the latest trunk enhancements into the sessions branch.

FossilOrigin-Name: fce667f2d93a4ba65ccf1e748469576a3cd7ffcc

diff --cc Makefile.msc
Simple merge

diff --cc main.mk
Simple merge

diff --cc manifest
index dd60773dd17523ed7867c83e2df141ba3794bb5c,144abcc80e5507153ea8a7ff785293dc9ca16ab9..e5ba609ecb7d00811933e45eb4fb633269e0f603
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Merge\sall\sthe\slatest\score\schanges\sinto\sthe\ssessions\sbranch.
- D 2012-10-15T14:25:16.488
 -C Enable\sthe\suse\sof\scoroutines\sas\san\salternative\sto\smanifesting\sviews\sused\nin\sa\sFROM\sclause.
 -D 2012-10-30T18:09:46.180
++C Pull\sall\sthe\slatest\strunk\senhancements\sinto\sthe\ssessions\sbranch.
++D 2012-10-30T21:03:48.529
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in 5f4f26109f9d80829122e0e09f9cda008fa065fb
+ F Makefile.in 82c41c0ed4cc94dd3cc7d498575b84c57c2c2384
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc eeacc62cbb02aa3ef6a5c8bdb5d4e6a70f5ca5b2
 -F Makefile.msc 911b8188f5d67801035a113e063c3023a617525d
++F Makefile.msc 1aba45c2d159c2beb62486e4eaa6e2c96c56dd46
  F Makefile.vxworks b18ad88e9a8c6a001f5cf4a389116a4f1a7ab45f
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
  F VERSION edab4af5a4623f8198833ea481ce98ab53750a8d
@@@ -101,21 -101,9 +101,21 @@@ 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 57d04e1d6a3579e673e61dea29f214fb4e0fc505
 +F ext/session/sqlite3session.h f374c9c4c96e08f67ac418871c29d423245c7673
 +F ext/session/test_session.c ea4dc9b4a1895c8e6bddcbfe3838d7eb57df2d99
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
- F main.mk 9c55b39d4887aa834ca2e827b7361d95703887bc
 -F main.mk 615aeaf7474cb2f141547e0c3ac08bcb75dd2b55
++F main.mk faf97ab7bd203e56b5d93975c80abd32c814ddec
  F mkdll.sh 7d09b23c05d56532e9d44a50868eb4b12ff4f74a
  F mkextu.sh 416f9b7089d80e5590a29692c9d9280a10dbad9f
  F mkextw.sh 4123480947681d9b434a5e7b1ee08135abe409ac
@@@ -141,21 -129,21 +141,21 @@@ F src/callback.c d7e46f40c3cf53c43550b7
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
  F src/ctime.c 72a70dcfda75d3a1f81041ce4573e7afddcd8e4e
  F src/date.c 067a81c9942c497aafd2c260e13add8a7d0c7dd4
- F src/delete.c e44a1b66cd3dc1e9e2c74147ee4991214e6e6978
- F src/expr.c 57fb8e7a05d4147e40b9f4c439e37ed2abab9332
 -F src/delete.c 9b8d308979114991e5dc7cee958316e07186941d
++F src/delete.c 9bc9463952bdc9fc43111b1f9c83a0af9b8e2239
+ F src/expr.c 152ba793a8747061c0c332857d0e4d4fd52d4397
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c c82a04e7a92bb728f9ab972b76590403283be2af
  F src/func.c cbb90dc84b22eea25caf39528d342279e61b8898
  F src/global.c fb44b11e02e06c995e6ed6642509edd23599d584
- F src/hash.c a4031441741932da9e7a65bee2b36b5d0e81c073
+ F src/hash.c ac3470bbf1ca4ae4e306a8ecb0fdf1731810ffe4
  F src/hash.h 2894c932d84d9f892d4b4023a75e501f83050970
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
 -F src/insert.c ad0d8943d2a4f0b52ebf75b9e459f2da00117dbd
 +F src/insert.c 6273647b67e27e3f81b7d1fd144307ea726841d0
  F src/journal.c 552839e54d1bf76fb8f7abe51868b66acacf6a0e
  F src/legacy.c a199d7683d60cef73089e892409113e69c23a99f
  F src/lempar.c cdf0a000315332fc9b50b62f3b5e22e080a0952b
  F src/loadext.c f20382fbaeec832438a1ba7797bee3d3c8a6d51d
- F src/main.c 5cee8048dde78b2b47f5c2090cbb31b10d190673
 -F src/main.c 5249486037f88e765cce7c4870846dc5a2cd2ed1
++F src/main.c febaf66b42c36433b170e4704fef5b8b073a6d61
  F src/malloc.c fe085aa851b666b7c375c1ff957643dc20a04bf6
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c 437c7c4af964895d4650f29881df63535caaa1fa
@@@ -186,16 -174,16 +186,16 @@@ F src/printf.c 4a9f882f1c1787a8b494a298
  F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
  F src/resolve.c 7b986a715ac281643309c29257bb58cfae7aa810
  F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0
- F src/select.c 2a82736faeca1fe93315eda20c691d68ec13bb6c
- F src/shell.c 8ee5a3cb502e2d574f97b43972e6c1e275e7bec7
+ F src/select.c 3a8baf4719f9723b4e0b43f2baa60692d0d921f8
+ F src/shell.c 24cd0aa74aff73ea08594629faead564c4c2a286
 -F src/sqlite.h.in c7be05ad191d2634292fcc77bdb2bcfa4526eb98
 +F src/sqlite.h.in d460ae07ecdd1c820272d9c217547c7b572cb4b7
  F src/sqlite3.rc fea433eb0a59f4c9393c8e6d76a6e2596b1fe0c0
  F src/sqlite3ext.h 6904f4aadf976f95241311fbffb00823075d9477
- F src/sqliteInt.h c00feec4f6debb1cb4bad802d2c7fe5050e744ca
 -F src/sqliteInt.h f29ed6fbbf80a6d9ac8aae9998ecae2b8d72e0ae
++F src/sqliteInt.h 205fa7fd18a7e6e0ed2ff9cfbccf36fb51304ee4
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
- F src/status.c 35939e7e03abf1b7577ce311f48f682c40de3208
+ F src/status.c 53463144deb5dfac0a66b3be4dd7844b8f8a4c98
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
 -F src/tclsqlite.c 515abd8e33e82aa330eeb54675185a7e1e5b6778
 +F src/tclsqlite.c 289be7b639406314813219ee7bc043d21f36ab12
  F src/test1.c 936afc02766403e5debca49a1817a780e116df7e
  F src/test2.c 4178056dd1e7d70f954ad8a1e3edb71a2a784daf
  F src/test3.c 3c3c2407fa6ec7a19e24ae23f7cb439d0275a60d
@@@ -244,20 -232,20 +244,20 @@@ F src/test_wholenumber.c 3d2b9ed1505c40
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
  F src/tokenize.c 1e86210d3976717a19238ea7b047fac481fe8c12
  F src/trigger.c 3f258307040173aff383eb23fb74c44fe829078c
 -F src/update.c 28d2d098b43a2c70dae399896ea8a02f622410ef
 +F src/update.c abb0fcabe551dae0a133fd2a4370b5a8c23b1831
  F src/utf.c 8d819e2e5104a430fc2005f018db14347c95a38f
  F src/util.c 0af2e515dc0dabacec931bca39525f6c3f1c5455
- F src/vacuum.c 587a52bb8833d7ac15af8916f25437e2575028bd
- F src/vdbe.c e8e2e34c23a474c38f494d572a0d8accaabd0b4a
- F src/vdbe.h 87b8ff40de3f55dbcdc33029416862f517c37a2f
- F src/vdbeInt.h 39acf85fa83f98e27e728722a0f53daf7d174b61
+ F src/vacuum.c 2727bdd08847fcb6b2d2da6d14f018910e8645d3
 -F src/vdbe.c e1b2f881f85598b8e5d3366a3cdba60526d40144
 -F src/vdbe.h b52887278cb173e66188da84dfab216bea61119d
 -F src/vdbeInt.h 79abf9b31be406d35ca77d6999cb2d42aaf91e78
 -F src/vdbeapi.c 4c2418161cf45392ba76a7ca92f9a5f06b96f89c
 -F src/vdbeaux.c 8c8cfd30063e9b3664e2faa0e3785102bf131a10
 -F src/vdbeblob.c 32f2a4899d67f69634ea4dd93e3f651936d732cb
++F src/vdbe.c 640a7e140c7dc0465eff7e515252e434ca77286e
++F src/vdbe.h 1223e2548e0970cf96f573ff6b99f804a36ad683
++F src/vdbeInt.h 2de43968dc47f1961d5bc76aa3cb68eacf433a7c
 +F src/vdbeapi.c 58fdcd56109c05876f69c25d47a138ef370d3647
- F src/vdbeaux.c 1005a2ea2cbbe5d2841367eebae67ce848a6247a
++F src/vdbeaux.c 5f53f96cda10e467ae308876157cad42572d9299
 +F src/vdbeblob.c 11248c6362389569764682eb0f59ce910f3cc381
  F src/vdbemem.c cb55e84b8e2c15704968ee05f0fae25883299b74
- F src/vdbesort.c 0dc1b274dcb4d4c8e71b0b2b15261f286caba39b
+ F src/vdbesort.c c61ca318681c0e7267da8be3abfca8469652a7e9
  F src/vdbetrace.c 8bd5da325fc90f28464335e4cc4ad1407fe30835
- F src/vtab.c 9c64ae18af78c740610df841c6f49fc2d240a279
+ F src/vtab.c b05e5f1f4902461ba9f5fc49bb7eb7c3a0741a83
  F src/wal.c f5c7b5027d0ed0e9bc9afeb4a3a8dfea762ec7d2
  F src/wal.h 29c197540b19044e6cd73487017e5e47a1d3dac6
  F src/walker.c 3d75ba73de15e0f8cd0737643badbeb0e002f07b
@@@ -1033,8 -1020,8 +1033,8 @@@ F tool/tostr.awk e75472c2f98dd76e06b8c9
  F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
- F tool/win/sqlite.vsix 67d8a99aceb56384a81b3f30d6c71743146d2cc9
- P f1fbb8c5bfa84e84e0b8e2872d83b06a0c0d5acc 8745530b9a877db77fe2ca3ea9c6bc99ce033055
- R 2fad70ce160d67d476b8ae23c3ce13a3
+ F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
 -P cbd8fddf3b4cde840279502e1e9b151bb4bd42f0 f83aa0de8470748b3cd0bff232aeea3baf8dae53
 -R 4d92f802c3d1be35ade1de0afef59aa0
++P 76767d651fe733614b1719aef9ad5ed4568234e4 9dca18f5fea84afbecb314ee1cdfb98430656af3
++R 44966c032a1121fa311efd7f4c01d9a9
  U drh
- Z 004a84637f514b12189e7dcddda1b18b
 -Z 3cf95a6ff7a3079d84c74ccc0794b887
++Z f9e45ab7bfa5d5b4a8fa6d0808ba86fd

diff --cc manifest.uuid
index 669e24dd0d978fd0ca97f6f12a775de4c8e473f7,7e30236ca5f5935195f4b1cfe17c8ed80dfbfc3c..5b8cae933235e3234f5485f7ccd28d99a887b3e9
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 76767d651fe733614b1719aef9ad5ed4568234e4
 -9dca18f5fea84afbecb314ee1cdfb98430656af3
++fce667f2d93a4ba65ccf1e748469576a3cd7ffcc

diff --cc src/delete.c
Simple merge

diff --cc src/main.c
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc src/vdbe.h
Simple merge

diff --cc src/vdbeInt.h
Simple merge

diff --cc src/vdbeaux.c
Simple merge