Merge all recent trunk changes into the sessions branch.

FossilOrigin-Name: f36bb5fa5c5e3430808fe35d58f45559a216d341

diff --cc manifest
index 8c2c5a108e2b87fd5ed9fdfccd6b1f2d353e9cef,fbd819836120133a40a54172f95dada84f98be6c..cd65a90b734442773af8642a28eddc3f9bd9ff1d
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Merge\sall\sthe\slatest\senhancements\sfrom\strunk.
- D 2015-02-06T15:40:32.340
 -C Fix\sa\scompiler\swarning\sassociated\swith\sUSE_PREAD64.
 -D 2015-02-21T00:56:05.294
++C Merge\sall\srecent\strunk\schanges\sinto\sthe\ssessions\sbranch.
++D 2015-02-21T15:13:50.198
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in 6b9e7677829aa94b9f30949656e27312aefb9a46
 +F Makefile.in e63f98067fef9d9112380e3aec9881f56d49f77e
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 -F Makefile.msc fc6b0b233b5621f3e56298e4d6a0b3f6c936c520
 +F Makefile.msc bed794fe507466c950f2b5c2d6d70b4e1e9bf14f
  F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
  F README.md d58e3bebc0a4145e0f2a87994015fdb575a8e866
  F VERSION d846487aff892625eb8e75960234e7285f0462fe
@@@ -198,12 -181,12 +198,12 @@@ F src/callback.c 7b44ce59674338ad48b0e8
  F src/complete.c 198a0066ba60ab06fc00fba1998d870a4d575463
  F src/ctime.c 98f89724adc891a1a4c655bee04e33e716e05887
  F src/date.c e4d50b3283696836ec1036b695ead9a19e37a5ac
- F src/delete.c ba0a9915d533ffc72ed628bb7af577707e88a9ee
- F src/expr.c abe930897ccafae3819fd2855cbc1b00c262fd12
 -F src/delete.c 37964e6c1d73ff49cbea9ff690c9605fb15f600e
++F src/delete.c 5075d88557eb4e2a7fdb2b61a96142830d8589b8
+ F src/expr.c 3ef111b88ae2941b84b6b6ea4be8d501ba1af0cb
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c e0444b61bed271a76840cbe6182df93a9baa3f12
- F src/func.c 6d3c4ebd72aa7923ce9b110a7dc15f9b8c548430
- F src/global.c 12561d70a1b25f67b21154622bb1723426724f75
+ F src/func.c f7f0f44b0a2cb568a9c42b1b07e613380ee0b9c6
+ F src/global.c 4f77cadbc5427d00139ba43d0f3979804cbb700e
  F src/hash.c 4263fbc955f26c2e8cdc0cf214bc42435aa4e4f5
  F src/hash.h c8f3c31722cf3277d03713909761e152a5b81094
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
@@@ -212,7 -195,7 +212,7 @@@ F src/journal.c b4124532212b6952f42eb2c
  F src/legacy.c ba1863ea58c4c840335a84ec276fc2b25e22bc4e
  F src/lempar.c 7274c97d24bb46631e504332ccd3bd1b37841770
  F src/loadext.c 86bd4e2fccd520b748cba52492ab60c4a770f660
- F src/main.c 649e23549326218dbb589be4a5a706954077a614
 -F src/main.c 80edeba383aac89f72498b2572a115e21d0ecbbd
++F src/main.c d01a9b0a8cee34d6a533148bcdc94d65e9205a33
  F src/malloc.c 740db54387204c9a2eb67c6d98e68b08e9ef4eab
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c abe6ee469b6c5a35c7f22bfeb9c9bac664a1c987
@@@ -243,16 -226,16 +243,16 @@@ F src/pcache1.c 1e77432b40b7d3288327d9c
  F src/pragma.c ea0be138a99784b14e87bd4522fea40e7b979e9c
  F src/pragma.h 09c89bca58e9a44de2116cc8272b8d454657129f
  F src/prepare.c 173a5a499138451b2561614ecb87d78f9f4644b9
- F src/printf.c 05edc41450d0eb2c05ef7db113bf32742ae65325
+ F src/printf.c 8da9a2687a396daa19860f4dc90975d319304744
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
- F src/resolve.c f6c46d3434439ab2084618d603e6d6dbeb0d6ada
+ F src/resolve.c f4d79e31ffa5820c2e3d1740baa5e9b190425f2b
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
- F src/select.c 1f2087523007c42900ffcbdeaef06a23ad9329fc
- F src/shell.c a5c0f162adc38a110fd787c4df15450a88be3c35
- F src/sqlite.h.in b815e35cd1a62e1f75302b423bea00c11c900d1b
+ F src/select.c e46cef4c224549b439384c88fc7f57ba064dad54
 -F src/shell.c 6276582ee4e9114e0bb0795772414caaf21c0f8e
 -F src/sqlite.h.in b02d8d19c5adc73bd02b225054103247aff64425
++F src/shell.c 75e9d6dc85586c4a8e52f3be44c3a23dd3ef8d0d
++F src/sqlite.h.in e26cf36c3dc7099d6fcef864e362ee26261cc082
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
  F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d
- F src/sqliteInt.h bb33187ba6dc43be4f739df94dd29780c7095639
 -F src/sqliteInt.h 57a405ae6d2ed10fff52de376d18f21e04d96609
++F src/sqliteInt.h 1e1c08093c57dbd7c5d0b6d945f1c1d039f1128e
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 81712116e826b0089bb221b018929536b2b5406f
  F src/table.c e7a09215315a978057fb42c640f890160dbcc45e
@@@ -268,11 -251,11 +268,11 @@@ F src/test8.c 610e3d523018ca63b08081795
  F src/test9.c bea1e8cf52aa93695487badedd6e1886c321ea60
  F src/test_async.c 21e11293a2f72080eda70e1124e9102044531cd8
  F src/test_autoext.c dea8a01a7153b9adc97bd26161e4226329546e12
- F src/test_backup.c 3875e899222b651e18b662f86e0e50daa946344e
+ F src/test_backup.c 2e6e6a081870150f20c526a2e9d0d29cda47d803
  F src/test_blob.c 1f2e3e25255b731c4fcf15ee7990d06347cb6c09
  F src/test_btree.c 2e9978eca99a9a4bfa8cae949efb00886860a64f
 -F src/test_config.c e7b2e1634324d746aa5e1c7e0929470e8be27953
 +F src/test_config.c fc2616bded292c77e7c13e5aa62dd2732a613ba2
- F src/test_demovfs.c 69b2085076654ebc18014cbc6386f04409c959a9
+ F src/test_demovfs.c 0de72c2c89551629f58486fde5734b7d90758852
  F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc
  F src/test_fs.c ced436e3d4b8e4681328409b8081051ce614e28f
  F src/test_func.c 14e543ae4d905ee31dc322b2f8d31bfac1769d45
@@@ -304,22 -287,22 +304,22 @@@ F src/test_vfs.c 5a14c63da9579ba148138c
  F src/test_vfstrace.c bab9594adc976cbe696ff3970728830b4c5ed698
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
  F src/threads.c 6bbcc9fe50c917864d48287b4792d46d6e873481
- F src/tokenize.c e00458c9938072b0ea711c850b8dcf4ddcb5fe18
+ F src/tokenize.c 05e52378c46efbc1fd63cbbbf7f3c555f840f4bf
  F src/trigger.c 25571661fdeae8c7f975ff40ffec205520a3f92f
 -F src/update.c 3c4ecc282accf12d39edb8d524cf089645e55a13
 +F src/update.c d207deb7a031f698104bee879de0632b611e72dd
  F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
  F src/util.c 98a7627ca48ad3265b6940915a1d08355eb3fc7e
- F src/vacuum.c 9b30ec729337dd012ed88d4c292922c8ef9cf00c
+ F src/vacuum.c 9460b9de7b2d4e34b0d374894aa6c8a0632be8ec
 -F src/vdbe.c ddfc977981cd6324668aa6b114045eb1c677421a
 -F src/vdbe.h 6fc69d9c5e146302c56e163cb4b31d1ee64a18c3
 -F src/vdbeInt.h bb56fd199d8af1a2c1b9639ee2f70724b4338e3a
 -F src/vdbeapi.c 3d88089b10f71750b019a806224f0277d371a072
 -F src/vdbeaux.c 97911edb61074b871ec4aa2d6bb779071643dee5
 -F src/vdbeblob.c 4f2e8e075d238392df98c5e03a64342465b03f90
 -F src/vdbemem.c 31d8eabb0cd78bfeab4e5124c7363c3e9e54db9f
 +F src/vdbe.c d18d7bbe5099b4ae7573673232eb29c12075f174
 +F src/vdbe.h b434bb75fbec973d18d49225a59833ae39ee2afc
- F src/vdbeInt.h dc69f0351bef56456fdba3e09d3387ba4f1b1520
- F src/vdbeapi.c 90aeb4b3f1dc86d6576a2ce2d5bad12761329bd5
++F src/vdbeInt.h 50fc184e25bfe1b39b8e508082cd3f0cd8a29b3d
++F src/vdbeapi.c 1f5af816d4206a48c2ed610be7a44ca613673521
 +F src/vdbeaux.c fbc0e6dfcf472e76001f7684b3b534710a645138
- F src/vdbeblob.c cb7359c2d99df92c35cdaedc12af6d4f83854cb7
++F src/vdbeblob.c ab33f9b57cfce7dddb23853090186da614be4846
 +F src/vdbemem.c 96e41193b4affd9ebc0eea2fa628879dac88c744
  F src/vdbesort.c 6d64c5448b64851b99931ede980addc3af70d5e2
  F src/vdbetrace.c 7e4222955e07dd707a2f360c0eb73452be1cb010
- F src/vtab.c c08ec66f45919eaa726bf88aa53eb08379d607f9
+ F src/vtab.c 699f2b8d509cfe379c33dde33827875d5b030e01
  F src/wal.c 39303f2c9db02a4e422cd8eb2c8760420c6a51fe
  F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
  F src/walker.c c253b95b4ee44b21c406e2a1052636c31ea27804
@@@ -1257,7 -1239,7 +1257,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 bebd131a3554ea95921e6edbc8aa36674ef25fe3 0f65a7e2e09f801b66897479d501607caeae4abf
- R 3e8e2e957fa8b0f2fdc88f57e368bf21
 -P 7560a9fa50236ecaa0617f1ab5bb5662f4a61c72
 -R afd779aaccfbda112c52de91ea006a71
++P ae7eef117f28a5dae7a05805f2d31ac532a9fcc5 c299e55a661c04f71ab43cb8aed04f8ece6e0567
++R b7f8fa563aa6e3bf4b2e063495f61f72
  U drh
- Z c69878ce0191da9398d2268dd32ed93d
 -Z 8991d0e22753a2d2a931885c01f739fa
++Z 87039a26f4b6e7975795e319beedb047

diff --cc manifest.uuid
index f58b33afefa725809c4015f1cc6d45c532429d67,799d2f85ad2ea52a7ed1fd66f404557a06838507..d66ebf70a72fbc380c9e7d368c0c7887743169bc
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- ae7eef117f28a5dae7a05805f2d31ac532a9fcc5
 -c299e55a661c04f71ab43cb8aed04f8ece6e0567
++f36bb5fa5c5e3430808fe35d58f45559a216d341

diff --cc src/delete.c
Simple merge

diff --cc src/main.c
Simple merge

diff --cc src/shell.c
Simple merge

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

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/vdbeInt.h
Simple merge

diff --cc src/vdbeapi.c
Simple merge

diff --cc src/vdbeblob.c
Simple merge