Merge all the latest trunk enhancements into the sessions branch.

FossilOrigin-Name: 94fd5bb6da5ef4d850c2ed4ad38afabc5569dae6

diff --cc manifest
index 2ab7a1eec9fedb0f7684eddbc79320fbf4182138,13539c3ab4618d8d4ce50106ad830412347407c1..212e1e98516bf5e96f75cea16a212a96252e6f5d
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,8 +1,8 @@@
- C Change\sto\sthe\ssession\smodule\sto\suse\suser-defined\sprimary\skeys\sinstead\sof\srowids\swhen\scollecting\schanges.
- D 2011-03-17T19:20:27
+ -----BEGIN PGP SIGNED MESSAGE-----
+ Hash: SHA1
+ 
 -C Update\sthe\simplementation\sof\s".testctrl"\sin\sthe\scommand-line\sshell\sto\suse\na\slook-up\stable\srather\sthan\sa\slong\ssequence\sof\sif-elses.\s\sShorten\ssource\ncode\slines\sof\sshell.c\sto\s80\scharacters\sor\sless.
 -D 2011-03-17T16:45:50.769
++C Merge\sall\sthe\slatest\strunk\senhancements\sinto\sthe\ssessions\sbranch.
++D 2011-03-18T12:35:36.113
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 27701a1653595a1f2187dc61c8117e00a6c1d50f
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -98,12 -102,9 +102,12 @@@ F ext/rtree/rtree_util.tcl 06aab2ed5b82
  F ext/rtree/sqlite3rtree.h 1af0899c63a688e272d69d8e746f24e76f10a3f0
  F ext/rtree/tkt3363.test 142ab96eded44a3615ec79fba98c7bde7d0f96de
  F ext/rtree/viewrtree.tcl eea6224b3553599ae665b239bd827e182b466024
- F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895
 +F ext/session/sqlite3session.c 4183792547af5b5d3ec1c8a3f858beb172682503
 +F ext/session/sqlite3session.h 63045871564085669b5cb1fb92e6efc2e1b1120a
 +F ext/session/test_session.c 2559ef68e421c7fb83e2c19ef08a17343b70d535
+ F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
 -F main.mk 54190fab7cdba523e311c274c95ea480f32abfb5
 +F main.mk ae0868e05c76eaa8a0ae3d6927a949b1c8e810d7
  F mkdll.sh 7d09b23c05d56532e9d44a50868eb4b12ff4f74a
  F mkextu.sh 416f9b7089d80e5590a29692c9d9280a10dbad9f
  F mkextw.sh 4123480947681d9b434a5e7b1ee08135abe409ac
@@@ -129,23 -130,23 +133,23 @@@ F src/btreeInt.h 20f73dc93b1eeb83afd725
  F src/build.c 00a327120d81ace6267e714ae8010c997d55de5d
  F src/callback.c a1d1b1c9c85415dff013af033e2fed9c8382d33b
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
- F src/ctime.c 7deec4534f3b5a0c3b4a4cbadf809d321f64f9c4
+ F src/ctime.c 52ff72f966cee3087e0138a3ec69371c22be3c01
  F src/date.c 1548fdac51377e4e7833251de878b4058c148e1b
 -F src/delete.c 7ed8a8c8b5f748ece92df173d7e0f7810c899ebd
 +F src/delete.c 3c0925e958a77804a004222baa1a2a8ad855306b
- F src/expr.c 8e2c607b3be87a35c75a1f5dac50c10666b083c0
+ F src/expr.c 00817c672af554321fd67c44325afd7cef0e4648
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
- F src/fkey.c 17950a28f28b23e8ad3feaac5fc88c324d2f600a
- F src/func.c cb41f614edc43b00bfeb030f9768e80eaff47edd
+ F src/fkey.c 418b840007c873975fd0d071746d952f8bca20ce
+ F src/func.c 3a8cb2fb2de3e3aed7f39106daf4878d9d17fcce
  F src/global.c 02335177cf6946fe5525c6f0755cf181140debf3
  F src/hash.c 458488dcc159c301b8e7686280ab209f1fb915af
  F src/hash.h 2894c932d84d9f892d4b4023a75e501f83050970
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
- F src/insert.c c56a64b1488921794c3855d54acfe4674c7cea0c
 -F src/insert.c 8ffb544ff516669aa84a6f13d05dbf5c93bdb1ea
++F src/insert.c b0d4150ae6d6fae7c3e8b69b65bcf37988d80ac0
  F src/journal.c 552839e54d1bf76fb8f7abe51868b66acacf6a0e
  F src/legacy.c a199d7683d60cef73089e892409113e69c23a99f
  F src/lempar.c 7f026423f4d71d989e719a743f98a1cbd4e6d99e
  F src/loadext.c 8af9fcc75708d60b88636ccba38b4a7b3c155c3e
- F src/main.c 9ab948225b8c362cdd6902c447abbf218607e0f3
 -F src/main.c b43dc11c8335ceb759d48358ddafe09f02b18a1d
++F src/main.c 3c09359bbc8d6eae238a77e6a5cb2cbf1a41edb5
  F src/malloc.c 92d59a007d7a42857d4e9454aa25b6b703286be1
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c 00bd8265c81abb665c48fea1e0c234eb3b922206
@@@ -179,10 -180,10 +183,10 @@@ F src/random.c cd4a67b3953b88019f8cd4cc
  F src/resolve.c 1c0f32b64f8e3f555fe1f732f9d6f501a7f05706
  F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
  F src/select.c d24406c45dd2442eb2eeaac413439066b149c944
- F src/shell.c 649c51979812f77f97507024a4cea480c6862b8b
- F src/sqlite.h.in 992c54d9bd451a041fb0b74fb5cd3b14db98e544
+ F src/shell.c 4a5e0ad845475c84881f0b25b1abba2ddaab0a72
 -F src/sqlite.h.in 369c767e6b9f101d63d8e4c5e40279f975ccec08
++F src/sqlite.h.in 208dc372c9b8d89ca962babcb7cb0c1b16d32bc4
  F src/sqlite3ext.h c90bd5507099f62043832d73f6425d8d5c5da754
- F src/sqliteInt.h db209477de559911d7f14c1d208cbf2bc46e9224
 -F src/sqliteInt.h 2cea3e47997e3f4d9b4f1ce62f99c35be1b5a586
++F src/sqliteInt.h d65b832eb82bd3f04cd27a750698c7f4b3d9273a
  F src/sqliteLimit.h a17dcd3fb775d63b64a43a55c54cb282f9726f44
  F src/status.c 4997380fbb915426fef9e500b4872e79c99267fc
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -225,26 -226,27 +229,27 @@@ F src/test_superlock.c 2b97936ca127d139
  F src/test_tclvar.c f4dc67d5f780707210d6bb0eb6016a431c04c7fa
  F src/test_thread.c bedd05cad673dba53326f3aa468cc803038896c0
  F src/test_vfs.c 2ed8853c1e51ac6f9ea091f7ce4e0d618bba8b86
+ F src/test_vfstrace.c f5c3b3b893d81a580d0f577e6d9bcfc1fd496136
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
  F src/tokenize.c 604607d6813e9551cf5189d899e0a25c12681080
- F src/trigger.c b8bedb9c0084ceb51a40f54fcca2ce048c8de852
- F src/update.c 18a862e3e08377a5afb26d6f16182a8f700a1ca7
+ F src/trigger.c 95d2ff4b2996fabe886c9764b5978980e29f4afa
 -F src/update.c 81911be16ece3c3e7716aa18565b4814ec41f8b9
++F src/update.c aa39db6c39a1e234e8badf49768e1389dbb34650
  F src/utf.c 1baeeac91707a4df97ccc6141ec0f808278af685
- F src/util.c ab1c92426494f499f42b9e307537b03e923d75c1
+ F src/util.c cd997077bad039efc0597eb027c929658f93c018
  F src/vacuum.c 924bd1bcee2dfb05376f79845bd3b4cec7b54b2f
- F src/vdbe.c fbf11bd681fd2313aaf59fb2fd7f02cd8324a88a
 -F src/vdbe.c ac6e8b8264dcc0e4beea44307ff63b1275a9ca3e
++F src/vdbe.c 94cd191b1b20b0124e09b056bbce3d09f79821b3
  F src/vdbe.h 4de0efb4b0fdaaa900cf419b35c458933ef1c6d2
 -F src/vdbeInt.h 6e6f28e9bccc6c703dca1372fd661c57b5c15fb0
 -F src/vdbeapi.c a09ad9164cafc505250d5dd6b69660c960f1308c
 -F src/vdbeaux.c 00439455c80ff7b37d7f2e5be5c0cf02de732a42
 +F src/vdbeInt.h 20d13da932eed0667a2e2383a9cb0f80099a5fd3
- F src/vdbeapi.c 3066456f64fb10c9c5151c684b5f5e8d67a5f4f2
- F src/vdbeaux.c 896844f9bf663202b3afa8c139e2caddcf855765
++F src/vdbeapi.c 988ee9420acf8c130d644e6d7282893efe927bbd
++F src/vdbeaux.c ce48afec3f218b755f7b0ef1bef54a4be44cd833
  F src/vdbeblob.c 18955f0ee6b133cd08e1592010cb9a6b11e9984c
- F src/vdbemem.c 0fa2ed786cd207d5b988afef3562a8e663a75b50
+ F src/vdbemem.c 0498796b6ffbe45e32960d6a1f5adfb6e419883b
  F src/vdbetrace.c 3ba13bc32bdf16d2bdea523245fd16736bed67b5
  F src/vtab.c b297e8fa656ab5e66244ab15680d68db0adbec30
- F src/wal.c 5386fb5e13c2daa8ab9062597fdc17bd849da371
+ F src/wal.c 7334009b396285b658a95a3b6bc6d2b016a1f794
  F src/wal.h 7a5fbb00114b7f2cd40c7e1003d4c41ce9d26840
  F src/walker.c 3112bb3afe1d85dc52317cb1d752055e9a781f8f
- F src/where.c bf8c0f584a2c9becb9110c37e151f9d4f73fbf7e
+ F src/where.c a6e89fe7e56ab7e633be6fdebdddd857e9e5bc99
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
  F test/alias.test 4529fbc152f190268a15f9384a5651bbbabc9d87
  F test/all.test 51756962d522e474338e9b2ebb26e7364d4aa125
@@@ -913,7 -917,14 +921,14 @@@ F tool/speedtest2.tcl ee2149167303ba8e9
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- P 526545c49f64d9063d1b888cfc14ece62fa3c13c
- R cab2f9d8485568249e1bae732085445e
- U dan
- Z 0451d1109f54d52c16342adf23f8ece9
 -P 869f894798a65f8bc0e0b083866a784fa0189f68
 -R a8def7fc552253bddf0337de8f57667b
++P 6614cfcb9c41da71ddec3c44a3de0d4d849e1cdd 54bacb95dd6e2d6ac4971391a40484ccb9126d29
++R e54868c8ee7f58a0691b9e0694987cf6
+ U drh
 -Z f32baca0676f04528da8db7e35d99aa0
++Z 8149dc4ff84780eb7c2d29113d1dc5ec
+ -----BEGIN PGP SIGNATURE-----
+ Version: GnuPG v1.4.6 (GNU/Linux)
+ 
 -iD8DBQFNgjx3oxKgR168RlERAkZlAJ9g0EAzYOwFcF/NGcxGCGlF65eaGACfcZkt
 -bA9BP3Fet3XmbiRxAgQtxR0=
 -=Yzeg
++iD8DBQFNg1GboxKgR168RlERAptpAJ4+cfNBHl8w0y578KOanLZsuj14mgCffUXp
++W65/Ci2dAe+flL3fcPt3X+4=
++=uYuP
+ -----END PGP SIGNATURE-----

diff --cc manifest.uuid
index 412c6f3bf5471e8b5e8e1b5d7c362baabcdeeb53,4be64fc574371df907bf156075a77e832a5ff81b..2d0f8d52c673547570984a73033dae51195c04f8
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 6614cfcb9c41da71ddec3c44a3de0d4d849e1cdd
 -54bacb95dd6e2d6ac4971391a40484ccb9126d29
++94fd5bb6da5ef4d850c2ed4ad38afabc5569dae6

diff --cc src/insert.c
Simple merge

diff --cc src/main.c
Simple merge

diff --cc src/sqlite.h.in
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/update.c
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc src/vdbeapi.c
Simple merge

diff --cc src/vdbeaux.c
index 974925158582872c900a58b84d79389c4c683d50,c7acbcb6466c8c247208d5fc47903d7d913010b5..97026b89fd471d984b7ecbc6a5cc806bc56eaefd
--- 1/src/vdbeaux.c
--- 2/src/vdbeaux.c
+++ b/src/vdbeaux.c
@@@ -75,6 -75,6 +75,7 @@@ const char *sqlite3_sql(sqlite3_stmt *p
  void sqlite3VdbeSwap(Vdbe *pA, Vdbe *pB){
    Vdbe tmp, *pTmp;
    char *zTmp;
++  assert( pA->db==pB->db );
    tmp = *pA;
    *pA = *pB;
    *pB = tmp;