Merge trunk fixes.

FossilOrigin-Name: 1df8cbbea66f303029737752f37cf2a6db98fcd4

diff --cc manifest
index 0fd0493f6d782c4bb43739119a6ce4dd59a226d2,53cae3d4c508fc2866d387a6c74cce469210dcfa..dde7861eca0697fe33240144d722170e94113e51
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\senhancements\sfrom\strunk.
- D 2015-06-10T20:00:49.246
 -C Remove\sstray\soutputs\sfrom\sthe\stest\ssuite.
 -D 2015-06-11T14:19:05.376
++C Merge\strunk\sfixes.
++D 2015-06-11T17:58:27.864
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 1063c58075b7400d93326b0eb332b48a54f53025
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -201,10 -201,10 +201,10 @@@ F src/complete.c a5cf5b4b56390cfb7b8636
  F src/ctime.c 5a0b735dc95604766f5dac73973658eef782ee8b
  F src/date.c e4d50b3283696836ec1036b695ead9a19e37a5ac
  F src/dbstat.c f402e77e25089c6003d0c60b3233b9b3947d599a
- F src/delete.c 5cfc68ff81ad92d8bf22ba92f7a9398c7f1d5eb9
- F src/expr.c 0550baeca8dd7472e298d9e881e5e3484f7666f8
 -F src/delete.c 8857a6f27560718f65d43bdbec86c967ae1f8dfa
++F src/delete.c 81fc0453b0e95275bef8c2091636fcafc7229e91
+ F src/expr.c 710c764c1974b15a0e56b004ff9f5e6ceab3a854
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
 -F src/fkey.c c9b63a217d86582c22121699a47f22f524608869
 +F src/fkey.c 6c5a2dbf8333303b033a2219e18ce8a9f99981c2
  F src/func.c 5b8b8e77a0fb644eaf8947d413804622e32692b6
  F src/global.c 4f77cadbc5427d00139ba43d0f3979804cbb700e
  F src/hash.c 4263fbc955f26c2e8cdc0cf214bc42435aa4e4f5
@@@ -255,7 -255,7 +255,7 @@@ F src/shell.c 07dda7cd692911d2f22269953
  F src/sqlite.h.in d165beeceb6b40af60f352a4d4e37e02d9af7df0
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
  F src/sqlite3ext.h 2ebeb634e751a61a6f0eebfa0f4669f46a42f6cd
- F src/sqliteInt.h b9957d1f7a974cfee02dbb880e4cf695d43d2791
 -F src/sqliteInt.h 8f095bfe43ba68c32bac8d5349131ffacc660967
++F src/sqliteInt.h e389c788cd9f0af14528dfcddefc9ccece17d385
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c f266ad8a2892d659b74f0f50cb6a88b6e7c12179
  F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e
@@@ -1286,7 -1286,8 +1286,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 a1eaf1718e4544c17495ad7a4e333276979b8299 6ddef2ad35ceb5822fc14c65bc7c6a2662edb63c
- R f469f404132e2683182471710f678f88
 -P e63d01c69c3e50f49ee3022a519c4f3e91f00520 e64a5681793238fa04fe3636f48d34b2dd36cdfa
 -R 169aa55aecdac74f95270959f0b49156
 -T +closed e64a5681793238fa04fe3636f48d34b2dd36cdfa
++P 0e23a079bd648f9778c857ec51e39acfd30a4040 afc6db9b105f32110112b877f06091757888a5f2
++R 66f6090af762e2af727925054063787e
  U drh
- Z ba88f60c8354d22ddfa769e6c6d29dcf
 -Z 8e453d8625c4e71ab15cead2df245827
++Z 15f99ba3f20685296cbae74ff03f5eca

diff --cc manifest.uuid
index 6b742cfefa45975e2fb162435903dc6b07acf552,9c8de4cbd1af750636508333bb0b3506d7b11422..98f9c756255421ef6aca1dcdf7eba98a287a26c8
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 0e23a079bd648f9778c857ec51e39acfd30a4040
 -afc6db9b105f32110112b877f06091757888a5f2
++1df8cbbea66f303029737752f37cf2a6db98fcd4

diff --cc src/delete.c
Simple merge

diff --cc src/sqliteInt.h
Simple merge