Merge recent trunk changes into the sessions branch.

FossilOrigin-Name: a9db017eabdefafcda87c497e8bafa07002ac0fe

diff --cc Makefile.in
Simple merge

diff --cc Makefile.msc
Simple merge

diff --cc main.mk
Simple merge

diff --cc manifest
index f734f7ed3e3a1635b52243af0d5ba05d837aa3a8,c9c66de972c22693a9b618eedcf7b6383473fb60..918ba1dafc3e49ba383267dbff5c4b624e53fb64
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Merge\sthe\slatest\strunk\senhancements\sinto\sthe\ssessions\sbranch.
- D 2014-06-30T20:02:55.053
 -C Add\sthe\sreadfile(FILENAME)\sand\swritefile(FILENAME,CONTENT)\sSQL\sfunctions\sto\nthe\scommand-line\sshell.
 -D 2014-07-24T12:39:59.049
++C Merge\srecent\strunk\schanges\sinto\sthe\ssessions\sbranch.
++D 2014-07-24T16:23:51.251
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in cdca3064ff319e7ef34eaf20bc32429e30903f48
 -F Makefile.in 5eb79e334a5de69c87740edd56af6527dd219308
++F Makefile.in 639859a6f81bd15921ccd56ddbd6dfd335278377
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc 91ddfb80ab8afc6d5bd9145d82e52e800f29acf5
 -F Makefile.msc 5b04e657cf08a9ac7fc47d876c5c8be962c47d6b
++F Makefile.msc d389ce1d436d21a93a9f5f6211dc45e4b8860962
  F Makefile.vxworks 034289efa9d591b04b1a73598623119c306cbba0
  F README.md 64f270c43c38c46de749e419c22f0ae2f4499fe8
  F VERSION 1c877615a9db323e3cd301e3d57d853f9d5c4a07
@@@ -160,7 -146,7 +160,7 @@@ F ext/session/test_session.c 7878ac0e2f
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk cd6daae5f386acaf508b63dd9888018602f50da8
 -F main.mk 036a65c9042b2f5013baf85c82629d700fe031c4
++F main.mk 152593de5d19eeab0fdaacfdedd5eafdfdd83d5a
  F mkopcodec.awk c2ff431854d702cdd2d779c9c0d1f58fa16fa4ea
  F mkopcodeh.awk c6b3fa301db6ef7ac916b14c60868aeaec1337b5
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
@@@ -189,8 -175,8 +189,8 @@@ F src/callback.c 174e3c8656bc29f91d710a
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
  F src/ctime.c 0231df905e2c4abba4483ee18ffc05adc321df2a
  F src/date.c 593c744b2623971e45affd0bde347631bdfa4625
 -F src/delete.c bcf8f72126cea80fc3d5bc5494cf19b3f8935aaf
 +F src/delete.c 50b74c1dde25d1ebcb4fa5c870762e6470ee46f1
- F src/expr.c 40d06d1543b1355aa02efa9666178f7642a96ed6
+ F src/expr.c b989d07fc7c8780fff77365a4fc59881223e340c
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c a549cff9fe8b736cdae21650ea0af6de29b77619
  F src/func.c 3bc223ea36cd29a91c481485343d0ee4257ab8dc
@@@ -203,7 -189,7 +203,7 @@@ F src/journal.c b4124532212b6952f42eb2c
  F src/legacy.c 0df0b1550b9cc1f58229644735e317ac89131f12
  F src/lempar.c cdf0a000315332fc9b50b62f3b5e22e080a0952b
  F src/loadext.c 867c7b330b740c6c917af9956b13b81d0a048303
- F src/main.c 13f3dcd2037ea5891e2c83a87f29872a50d5ab79
 -F src/main.c cfdb2aa5d248ff1af60227cc3f6d485ba86f92dc
++F src/main.c 20aa3e3d5ef5727dff8efbfc3a9420460e201e05
  F src/malloc.c 0203ebce9152c6a0e5de520140b8ba65187350be
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c c0c990fcaddff810ea277b4fb5d9138603dd5d4b
@@@ -237,11 -223,11 +237,11 @@@ F src/random.c d10c1f85b6709ca97278428f
  F src/resolve.c 5fc110baeacf120a73fe34e103f052632ff11a02
  F src/rowset.c a9c9aae3234b44a6d7c6f5a3cadf90dce1e627be
  F src/select.c 6762c62e11b504aa014edceab8886495165e3a77
- F src/shell.c 56de2dfa3f25def4bf03098f7e2256fbb42f6e3c
- F src/sqlite.h.in a585e10c0d181b0f102df93477cfd3ab2b98b2e5
+ F src/shell.c 191129c3f7a9cf241aea90ff6a6be3e74d3767f0
 -F src/sqlite.h.in ac4451c9da2771d2f4d702ef89722407242906d9
++F src/sqlite.h.in a7cfafa4874726efb9ae51a88770a9de8b21a42c
  F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e
  F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
- F src/sqliteInt.h 19dc37674323885ba5b6be808d711253a7b027ae
 -F src/sqliteInt.h 152134c6223369e2e1acb7b9cc2c0db052dae28a
++F src/sqliteInt.h 83f438c59867d023c9d555243706a9edb4945662
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -259,7 -245,7 +259,7 @@@ F src/test_async.c 21e11293a2f72080eda7
  F src/test_autoext.c dea8a01a7153b9adc97bd26161e4226329546e12
  F src/test_backup.c 3875e899222b651e18b662f86e0e50daa946344e
  F src/test_btree.c 2e9978eca99a9a4bfa8cae949efb00886860a64f
- F src/test_config.c f3865829c8add75c49b3cb53f0494650b9292138
 -F src/test_config.c 42fb068a038c8684741522f551325228b1389e63
++F src/test_config.c f0252240543895769a6bf037c206a4af74cf1e3c
  F src/test_demovfs.c 69b2085076654ebc18014cbc6386f04409c959a9
  F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc
  F src/test_fs.c ced436e3d4b8e4681328409b8081051ce614e28f
@@@ -291,18 -277,18 +291,18 @@@ F src/test_thread.c 1e133a40b50e9c035b0
  F src/test_vfs.c f84075a388527892ff184988f43b69ce69b8083c
  F src/test_vfstrace.c bab9594adc976cbe696ff3970728830b4c5ed698
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
- F src/tokenize.c 6da2de6e12218ccb0aea5184b56727d011f4bee7
+ F src/tokenize.c ae45399d6252b4d736af43bee1576ce7bff86aec
  F src/trigger.c 66f3470b03b52b395e839155786966e3e037fddb
 -F src/update.c 01564b3c430f6c7b0a35afaf7aba7987206fa3a5
 +F src/update.c 0f16e1d55d642a7ae3199bd0c2c1f51a7ef1b9d4
  F src/utf.c a0314e637768a030e6e84a957d0c4f6ba910cc05
- F src/util.c 049fe1d3c0e2209c1bee107aec2fcff6285f909f
+ F src/util.c 3076bdd51cdbf60a6e2e57fada745be37133c73e
  F src/vacuum.c 3728d74919d4fb1356f9e9a13e27773db60b7179
- F src/vdbe.c 62f985592bfa011c2b35f8d7bfb4d4090340ae40
 -F src/vdbe.c fa74c6563486022920db4d73897bd9b837c7441d
 -F src/vdbe.h c63fad052c9e7388d551e556e119c0bcf6bebdf8
 -F src/vdbeInt.h f41a7cf5a40e7abd994d5fe3a04589ae3e1154e7
 -F src/vdbeapi.c 24e40422382beb774daab11fe9fe9d37e8a04949
 -F src/vdbeaux.c 1ffe0bbc3a2c8aedd95622de9be6b6d07b3d3c6b
 -F src/vdbeblob.c 9205ce9d3b064d9600f8418a897fc88b5687d9ac
++F src/vdbe.c 7224ed5d23599e0bc57b79d03901e4b86d609da1
 +F src/vdbe.h ca3b6df299adce6e2f499c57e42ae54f142ae823
- F src/vdbeInt.h 3c295f4466f4b8a7f4b9b126d20bbbb21c38011f
- F src/vdbeapi.c d3c662762b62e330a03f29de8e2ac7098ef78030
- F src/vdbeaux.c 36eb94ea73e470ffcfec401043d8c2fc7359be98
++F src/vdbeInt.h 31b5cb53bd7f7fda3805a323c970da65fb5a5efc
++F src/vdbeapi.c 52335de5ff97bba93d6779d8df87feab5d53d7df
++F src/vdbeaux.c f7ef74c5fb7f3da380b719ecbf9f23e558b099d3
 +F src/vdbeblob.c d7c232d1c6afc7ee1176c38b7d81b2e17af15ceb
  F src/vdbemem.c d90a1e8acf8b63dc9d14cbbea12bfec6cec31394
  F src/vdbesort.c 44441d73b08b3a638dcdb725afffb87c6574ad27
  F src/vdbetrace.c 6f52bc0c51e144b7efdcfb2a8f771167a8816767
@@@ -614,7 -601,8 +615,8 @@@ F test/fuzz_malloc.test 328f70aaca63adf
  F test/fuzzer1.test d4c52aaf3ef923da293a2653cfab33d02f718a36
  F test/fuzzerfault.test 8792cd77fd5bce765b05d0c8e01b9edcf8af8536
  F test/genesis.tcl 1e2e2e8e5cc4058549a154ff1892fe5c9de19f98
 -F test/hook.test 162d7cef7a2d2b04839fe14402934e6a1b79442f
+ F test/hexlit.test f9ecde8145bfc2341573473256c74ae37a200497
 +F test/hook.test 5429d34d6e59086175d8efbcd7e14d891375bdfb
  F test/icu.test 70df4faca133254c042d02ae342c0a141f2663f4
  F test/in.test 047c4671328e9032ab95666a67021adbbd36e98e
  F test/in2.test 5d4c61d17493c832f7d2d32bef785119e87bde75
@@@ -1197,7 -1184,7 +1199,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 09e75d82d02f900e58eceaaa010a42fc7044c89f f925e9baafea625f63105f8013abb3807b418379
- R 479d9c5a6e74a479850ba5a90b6bb579
 -P f8f79f28785db716b10c3bc9d6652b98253fd125
 -R 3cb7c1591be4171f813333f040f9142c
++P a5d94eaba6aa12ff16d2a0af2fc752bcdb461877 fb1048cb2b613a0dbfe625a5df05e9dcd736a433
++R ccf3fca6dda4e0dab5dd164f413978b7
  U drh
- Z 79686a893dbf1703dda2bbbc832594c3
 -Z d6bf09c8f21a2381ecdf6b5a91f85057
++Z 6de22260129246198d4b45e0c941be73

diff --cc manifest.uuid
index 9bf239800012edf73ffbf054f3739e6b3fe86b14,c704a64b44925d6691f5df80ab4d249f103166c9..adc84ab064a3cc49420c1a3cec903c3f7512d534
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- a5d94eaba6aa12ff16d2a0af2fc752bcdb461877
 -fb1048cb2b613a0dbfe625a5df05e9dcd736a433
++a9db017eabdefafcda87c497e8bafa07002ac0fe

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/test_config.c
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc src/vdbeInt.h
Simple merge

diff --cc src/vdbeapi.c
Simple merge

diff --cc src/vdbeaux.c
Simple merge