Merge updates from trunk.

FossilOrigin-Name: 08c9a4ea6353900095a471365a8611a443f5f399

diff --cc manifest
index 632f5523e3531c6f8f8711e52fa39146b51e77ce,7def92e6e1d83b96fe81e997202b0683063dde78..f02f267a59e82952660145a3252de498757c9207
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Enhancements\sand\supdates\sto\sthe\sWin32\smutex\ssubsystem.
- D 2014-07-29T05:49:02.604
 -C Add\sthe\sSQLITE_TESTCTRL_ISINIT\sfile\scontrol.
 -D 2014-07-29T14:09:21.164
++C Merge\supdates\sfrom\strunk.
++D 2014-07-29T18:03:36.072
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 5eb79e334a5de69c87740edd56af6527dd219308
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -189,7 -189,7 +189,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 2c7647fd706cbb048e2b70429e552a7bf732d298
 -F src/main.c fbe7c756f8974c547f82396253dd507e877f411a
++F src/main.c bbf7f993843fc3fc496089747f6849272d77e824
  F src/malloc.c 0203ebce9152c6a0e5de520140b8ba65187350be
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c c0c990fcaddff810ea277b4fb5d9138603dd5d4b
@@@ -1184,10 -1184,7 +1184,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 5350229b52b18a4961858a30538c5c75e5bd3048
- R de509ee2752907682d663ce7b389c5a6
- T *branch * winMutex
- T *sym-winMutex *
- T -sym-trunk *
 -P 8cc41b0bf365af47c2061ffe44c86018945dd239
 -R 0a47475429662a9995bbe963fdd69743
 -U drh
 -Z e526885cd3c9012daec258cf388db74a
++P 18984c321049a759f6619cfa17fb3f4e7b3e08ea 8b651d4d6cde7efbc0cc7155948f477477be100e
++R b75cbb8ba71bd17b820832cbd89e629a
 +U mistachkin
- Z 9395c7aaf9a6a0a0988325332158758a
++Z a13e8a46e02d53cb54acbe3827cbc27f

diff --cc manifest.uuid
index 24c9f3e6fa95fa7dd5881b2ceed4a270af4512f2,60b259b93246cea0089f94845728905dff7025fd..16a64d9336a8501af8de9610a3751fa82df17f28
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 18984c321049a759f6619cfa17fb3f4e7b3e08ea
 -8b651d4d6cde7efbc0cc7155948f477477be100e
++08c9a4ea6353900095a471365a8611a443f5f399

diff --cc src/main.c
Simple merge