Merge recent changes from trunk.

FossilOrigin-Name: 6eefdad946da6a5f4052ac51d327777890fa3f18

diff --cc manifest
index 01d72475f4d116de655f033c0c0740f38278ddcb,6c0b7335d0238bef3e8fc8aeac338785f5ff1fce..01dfb4169449064dd66cc81998105fa8160c508e
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Rearrange\ssome\sconditionals\sand\sadd\s#if\sstatements\sto\smake\sthe\scode\smore\ntestable.
- D 2014-05-16T20:24:51.024
 -C Internally,\suse\sa\s64-bit\sintegers\sfor\ssegment\slevel\snumbers.
 -D 2014-05-17T16:56:52.166
++C Merge\srecent\schanges\sfrom\strunk.
++D 2014-05-19T23:17:33.708
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in dd2b1aba364ff9b05de41086f74407f285c57670
 +F Makefile.in de92112472618cb869d27249966bad1783e4a853
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 -F Makefile.msc 52911c6bfeaf9b40f47ef4615ab66d98ab0f2b3d
 +F Makefile.msc f64754550a1272b7f840e8594a8b40c0b46792b4
  F Makefile.vxworks 034289efa9d591b04b1a73598623119c306cbba0
  F README.md 64f270c43c38c46de749e419c22f0ae2f4499fe8
  F VERSION 9f823c026c6a32fc5f84d212a8aae0a221dba45c
@@@ -187,7 -187,7 +187,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 c2005c6386b087532757360b86584d0af5a4d02c
 -F src/main.c 1c164c7b742f0cd60290b34dc9086df9f939f490
++F src/main.c 14f02e450d8e5f78af7e75905632dd785cf93363
  F src/malloc.c 0203ebce9152c6a0e5de520140b8ba65187350be
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c c0c990fcaddff810ea277b4fb5d9138603dd5d4b
@@@ -745,7 -746,7 +747,7 @@@ F test/pagesize.test 1dd51367e752e742f5
  F test/pcache.test b09104b03160aca0d968d99e8cd2c5b1921a993d
  F test/pcache2.test a83efe2dec0d392f814bfc998def1d1833942025
  F test/percentile.test b98fc868d71eb5619d42a1702e9ab91718cbed54
- F test/permutations.test 33e7e239ba494fdb30e2f4ffc64c508b145ff42f
 -F test/permutations.test d8946218493c77806ec1029df473d8ed4ad9aef6
++F test/permutations.test 5da30f29e9bc59cf21c891ed1360b14d5d777c68
  F test/pragma.test adb21a90875bc54a880fa939c4d7c46598905aa0
  F test/pragma2.test aea7b3d82c76034a2df2b38a13745172ddc0bc13
  F test/printf.test ec9870c4dce8686a37818e0bf1aba6e6a1863552
@@@ -1175,7 -1172,7 +1177,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P cceac14fd83ddd8f868c1767cdc66635607cb159
- R 48ad2b172d9e67d362d3e27e91c64651
 -P 9fde5b960af39b187474e5b2909ff0e56d5e0bf9 7e60347e21a7473974061965a8d1f2eadde987e2
 -R 760c47be4e4c59e75f81e88f9a3c89bc
 -U dan
 -Z a762a27782746cb8cee894bb7c1f28d3
++P 17afd77057f8695733a9a60225646c1d8813b1a0 8180e320ee4090e41511836678e49a98c0b228e8
++R caf94a64ae09103b6f818ad8457d731e
 +U drh
- Z 9751e875adf689a22af045a3a24a99e5
++Z 654b19280087cc59a60d4e21f62a0c05

diff --cc manifest.uuid
index d6d88fd0bff6873eed316864deab1bcebba36443,6307ea55eb5e995eacb67e5c0e4a30a0dec971b2..ea7a5b8d598d5ed32b1045f53c16a851044a2d8a
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 17afd77057f8695733a9a60225646c1d8813b1a0
 -8180e320ee4090e41511836678e49a98c0b228e8
++6eefdad946da6a5f4052ac51d327777890fa3f18

diff --cc src/main.c
Simple merge

diff --cc test/permutations.test
index e114caf207eae6514f11d78d8b196e8dfe68fa63,0e5cc2c8d2b22edc216ea2afec3e0b67658c7288..d914c12711cb6a5f226a52f08408ffce3a329065
--- 1/test/permutations.test
--- 2/test/permutations.test
+++ b/test/permutations.test
@@@ -112,7 -112,7 +112,7 @@@ set allquicktests [test_set $alltests -
    incrvacuum_ioerr.test autovacuum_crash.test btree8.test shared_err.test
    vtab_err.test walslow.test walcrash.test walcrash3.test
    walthread.test rtree3.test indexfault.test securedel2.test
-   sort3.test sort4.test
 -  fts4growth.test fts4growth2.test
++  sort3.test sort4.test fts4growth.test fts4growth2.test
  }]
  if {[info exists ::env(QUICKTEST_INCLUDE)]} {
    set allquicktests [concat $allquicktests $::env(QUICKTEST_INCLUDE)]