Update the sessions branch with the latest trunk changes.

FossilOrigin-Name: d09355050a74344c1cb6d303af9f601cd41e2368

diff --cc main.mk
Simple merge

diff --cc manifest
index f7ff2160c12aec0efa5f873dba60fb3c2b3835af,af0d36f61c4a2ac7ce7b7a9852d4e008b6d67720..d001bf5a8a458042e10130d173ea1263f229bb9a
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,12 -1,12 +1,12 @@@
- C Merge\strunk\schanges\sinto\sthe\ssessions\sbranch.
- D 2013-05-09T23:40:59.000
 -C The\ssqlite3ExprCollSeq()\sfunction\scan\sno\slonger\sbe\scalled\swhile\sparse\nthe\sschema,\sso\sremove\sthe\scode\spath\sinside\sof\ssqlite3ExprCollSeq()\sthat\ndealt\swith\sthat\scase.
 -D 2013-05-15T17:47:12.088
++C Update\sthe\ssessions\sbranch\swith\sthe\slatest\strunk\schanges.
++D 2013-05-15T18:45:14.080
  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
@@@ -125,7 -114,7 +126,7 @@@ F ext/session/test_session.c 23eddaf713
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 3f820e18c43504b25da40ff4b4cdb66dc4c4907e
- F main.mk 06e980ed70c3fa4c27c35ff38735af6e05a64304
 -F main.mk a8ebdf910e2cc10db1f9f54ec316f637458e8001
++F main.mk e1aa28b8104784696a7ca9c15d0b6c4bf156ae02
  F mkdll.sh 7d09b23c05d56532e9d44a50868eb4b12ff4f74a
  F mkextu.sh 416f9b7089d80e5590a29692c9d9280a10dbad9f
  F mkextw.sh 4123480947681d9b434a5e7b1ee08135abe409ac
@@@ -157,8 -146,8 +158,8 @@@ F src/callback.c d7e46f40c3cf53c43550b7
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
  F src/ctime.c 4262c227bc91cecc61ae37ed3a40f08069cfa267
  F src/date.c 067a81c9942c497aafd2c260e13add8a7d0c7dd4
 -F src/delete.c aeabdabeeeaa0584127f291baa9617153d334778
 +F src/delete.c 39a770e9729b1acd2de347f8f614584841d0083e
- F src/expr.c 437c03d5bb4fe3a53ecab3ad0286d6c5260da7ed
+ F src/expr.c e40d198a719aba1d2514f6e1541f9154f976ceb6
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c e16942bd5c8a868ac53287886464a5ed0e72b179
  F src/func.c d3fdcff9274bc161152e67ed3f626841c247f4b9
@@@ -171,7 -160,7 +172,7 @@@ F src/journal.c b4124532212b6952f42eb2c
  F src/legacy.c 0df0b1550b9cc1f58229644735e317ac89131f12
  F src/lempar.c cdf0a000315332fc9b50b62f3b5e22e080a0952b
  F src/loadext.c c48f7f3f170e502fe0cc20748e03c6e0b5a016c2
- F src/main.c dca921cb27c2221fe726a962b74aad19255a5bf4
 -F src/main.c ccbac976228cd21209ede2bdc82bbf22b0ddf197
++F src/main.c 393460eeb03d98f52863c1def596f988b33fe2a1
  F src/malloc.c fe085aa851b666b7c375c1ff957643dc20a04bf6
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c 437c7c4af964895d4650f29881df63535caaa1fa
@@@ -1075,7 -1064,7 +1077,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 ae6c4a0906ad8caabd8c605bb39c5fb979ab39a2 cf5c3642247fdd34d87f0368594cd7b8f081636a
- R aa02d52ce458f281b5bc9615e6d33430
 -P 5cc1cc55d28a73d390d51fdf6f2c026f1cab1d75
 -R e7ec9db939b43c1fb3d0a5a8ccbae374
++P 512f8a1ef8c4cf50723cfc4a78b7370dc37358d9 867b3e3b29a357f68e48f0898bf323c5dd0575a4
++R ffa29f370c90d286799404471155a28b
  U drh
- Z 94e59add3d7670652b5bb83515516e8f
 -Z 1e4ce829f36f461fad5816fc545c080f
++Z 1d96d56a3ef3c0775b8112327033ec85

diff --cc manifest.uuid
index 4bfe0f99606ef19d9c751a4da73e99c146f850e5,58d9438daf1248fd7744c7a45fd4f2ca8c5f07bd..bc304b83ee5162cd5b256d074d763c94415b0e6d
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 512f8a1ef8c4cf50723cfc4a78b7370dc37358d9
 -867b3e3b29a357f68e48f0898bf323c5dd0575a4
++d09355050a74344c1cb6d303af9f601cd41e2368

diff --cc src/main.c
Simple merge