Merge recent trunk changes into sessions.

FossilOrigin-Name: 95e77efe076ab421bd246119c47dba5dacf9d087

diff --cc manifest
index 0602716bed0ca59ef81a201b23dbe7ae9645514c,97b4f2b46f3e239df96c6d2deb8bb33d02823a81..94ba8af65e3b94958c8c21e1d5ea8b392407bf50
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Merge\sall\srecent\schanges\sfrom\strunk,\nincluding\sthe\sfix\sfor\sthe\sOP_SCopy-vs-OP_Copy\sproblem.
- D 2014-04-03T16:35:33.203
 -C Add\sthe\sSQLITE_RUNTIME_BYTEORDER\scompile-time\soption\sto\sforce\sSQLite\sto\scheck\nthe\sprocessor\sbyte-order\sat\srun-time.\s\sAdd\sadditional\scompile-time\sbyte\sorder\nchecks\sfor\sARM,\sPPC,\sand\sSPARC.
 -D 2014-04-18T00:49:29.419
++C Merge\srecent\strunk\schanges\sinto\ssessions.
++D 2014-04-18T01:10:05.240
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81
 +F Makefile.in e4ee6d36cdf6136aee0158675a3b24dd3bf31a5a
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 -F Makefile.msc fdacba6fb574868c71fde6db6b77789a383a4c19
 +F Makefile.msc b448317831d9c364bf501538becce5cc1f0a0f8b
  F Makefile.vxworks db21ed42a01d5740e656b16f92cb5d8d5e5dd315
  F README.md 64f270c43c38c46de749e419c22f0ae2f4499fe8
  F VERSION 9f823c026c6a32fc5f84d212a8aae0a221dba45c
@@@ -186,8 -172,8 +186,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 19df05f1ab55f021605e1c7a3c0a3851876fb3c7
- F src/expr.c da2b3cb41081af6b56e95e7c9e95949564ce2e21
 -F src/delete.c bcf8f72126cea80fc3d5bc5494cf19b3f8935aaf
++F src/delete.c 50b74c1dde25d1ebcb4fa5c870762e6470ee46f1
+ F src/expr.c 4f9e497c66e2f25a4d139357a778c84d5713207c
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c 5269ef07b100763134f71b889327c333bd0989cf
  F src/func.c 2945bb2c4cdc0ac43733046285a4434310be1811
@@@ -200,7 -186,7 +200,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 81453a961f9096bf0eb76a48d82c0f0509d62bf0
 -F src/main.c 0a8cfb6b2899649880e5874ac9bfd1c6f7c6a4a3
++F src/main.c a71db3a3c95e4b435644511cea305f28be73673f
  F src/malloc.c 0203ebce9152c6a0e5de520140b8ba65187350be
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c c0c990fcaddff810ea277b4fb5d9138603dd5d4b
@@@ -230,13 -216,13 +230,13 @@@ F src/prepare.c 677521ab7132615a8a26107
  F src/printf.c e5a0005f8b3de21f85da6a709d2fbee76775bf4b
  F src/random.c d10c1f85b6709ca97278428fd5db5bbb9c74eece
  F src/resolve.c 273d5f47c4e2c05b2d3d2bffeda939551ab59e66
- F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0
+ F src/rowset.c a9c9aae3234b44a6d7c6f5a3cadf90dce1e627be
  F src/select.c 269c3e31a450fce642a10569221a49180348c88e
- F src/shell.c 5260f2ada8dd06e9f5ae0a448c8c01e7a75dd881
- F src/sqlite.h.in a31c8b7782a0388b4bd823ed3a3a3e4b93b0cf42
+ F src/shell.c 2afe7a7154e97be0c74c5feacf09626bda8493be
 -F src/sqlite.h.in bde98816e1ba0c9ffef50afe7b32f4e5a8f54fe0
++F src/sqlite.h.in 6e6d3e092ca968abb3e65fbe22ec9220a3b616b6
  F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e
  F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
- F src/sqliteInt.h 2ce2e12bc5a4cf8e5511ee11ee4778a1911be7e9
 -F src/sqliteInt.h d3ca0bdd6743c9af2f333cb372b4bf95b19cd1fd
++F src/sqliteInt.h 8697c8e82d4d2ccbfe7fd2f582081e600c9dc7fc
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -253,8 -239,8 +253,8 @@@ F src/test9.c bea1e8cf52aa93695487baded
  F src/test_async.c 21e11293a2f72080eda70e1124e9102044531cd8
  F src/test_autoext.c dea8a01a7153b9adc97bd26161e4226329546e12
  F src/test_backup.c 3875e899222b651e18b662f86e0e50daa946344e
- F src/test_btree.c 5b89601dcb42a33ba8b820a6b763cc9cb48bac16
+ F src/test_btree.c 2e9978eca99a9a4bfa8cae949efb00886860a64f
 -F src/test_config.c 0336e0bdbe541b4af89d7e3dd0656e8e6b51e585
 +F src/test_config.c b131030783f4328beb7008dbfe7392c7f086abc7
  F src/test_demovfs.c 69b2085076654ebc18014cbc6386f04409c959a9
  F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc
  F src/test_fs.c ced436e3d4b8e4681328409b8081051ce614e28f
@@@ -292,12 -278,12 +292,12 @@@ F src/update.c 7bb549d61efc6853f5cc708c
  F src/utf.c 6dc9ec9f1b3db43ae8ba0365377f11df1ee4c01c
  F src/util.c c46c90459ef9bdc0c6c73803cf4c55425b4771cf
  F src/vacuum.c 3728d74919d4fb1356f9e9a13e27773db60b7179
- F src/vdbe.c 47bdf5f82fa23548bc0ee720c54e3b2b8802babe
 -F src/vdbe.c bf284edea1cee0508dc93c79a73498e0f317edb7
 -F src/vdbe.h 394464909ed682334aa3d5831aae0c2fe2abef94
 -F src/vdbeInt.h e6d83e5bfd62fc6685ba1ed6153f7099f82de9f7
 -F src/vdbeapi.c 0ed6053f947edd0b30f64ce5aeb811872a3450a4
 -F src/vdbeaux.c e493f38758c4b8f4ca2007cf6a700bd405d192f3
 -F src/vdbeblob.c 9205ce9d3b064d9600f8418a897fc88b5687d9ac
++F src/vdbe.c 9d883d5c91c5e7636cd56e952a0ff567e2d5c119
 +F src/vdbe.h d03fcf47890ae1c79a335ca994cb878b302697ca
 +F src/vdbeInt.h c05d4572211384c560b7579e7a299248cf31d6bd
 +F src/vdbeapi.c d3c662762b62e330a03f29de8e2ac7098ef78030
- F src/vdbeaux.c f9c225c26b4cab6239a7790b4bd14a6cd96ba19e
- F src/vdbeblob.c 2d1f0fdb0f5b72118520980360a594b1c30cbdd8
++F src/vdbeaux.c e0c2e24ee12c94b6d7cb1c521a0b26cd2e3231d9
++F src/vdbeblob.c d7c232d1c6afc7ee1176c38b7d81b2e17af15ceb
  F src/vdbemem.c 6fc77594c60f6155404f3f8d71bf36d1fdeb4447
  F src/vdbesort.c 4abb7c0f8f19b7d7d82f4558d5da1a30fdf9ea38
  F src/vdbetrace.c 6f52bc0c51e144b7efdcfb2a8f771167a8816767
@@@ -1174,7 -1160,7 +1175,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
  F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
- P fc8ca1a87e7127bd28f32fd809aec3e24355fbfa d5513dfa23baa0b0a095aaf17d19aacd30dcef61
- R 507e4fb477cf51261d2563e52f7cfa77
 -P 9c6961967ae00e563ebe2859eaf2639a79f2cb01
 -R 1b4cbcab83595d3a8147d0a70e1ae961
++P 9515c8344a6743bbb0c6a6e49fb79fb3139090df 2c5363873a6f990a0abaacac6303acd46b48befc
++R 6f10c61594cf9e1d36bddcd9a9abd40d
  U drh
- Z a91c37323943563a6d3bfb60a104e003
 -Z a694f54c65c4a003c92caa29b70309b3
++Z cbe658a5d5d955eb999ebf57e51622f9

diff --cc manifest.uuid
index 7a0e457ea730c2ad8afcfd9806d05cd2a68f62bc,05a8b60e7e23e5ff2280e3f2abb5a5688a443e4c..6da7ed206cb3c90dd711450702f7c2723d1e6364
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 9515c8344a6743bbb0c6a6e49fb79fb3139090df
 -2c5363873a6f990a0abaacac6303acd46b48befc
++95e77efe076ab421bd246119c47dba5dacf9d087

diff --cc src/delete.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/vdbe.c
Simple merge

diff --cc src/vdbeaux.c
Simple merge

diff --cc src/vdbeblob.c
Simple merge