From: mistachkin <mistachkin@noemail.net>
Date: Mon, 14 Sep 2015 22:53:07 +0000 (+0000)
Subject: Merge updates from trunk.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2724d0e742eec4bf83d70fff8c1e7ca3371f869b;p=thirdparty%2Fsqlite.git

Merge updates from trunk.

FossilOrigin-Name: 25c157714dc1e89988543d9b7df6b1791911e8a1
---

2724d0e742eec4bf83d70fff8c1e7ca3371f869b
diff --cc manifest
index 7874a645f1,1f1b10325e..d1044ae212
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Re-check\ssqlite3GlobalConfig.isInit\safter\sthe\smutex\ssubsystem\shas\sbeen\sinitialized.
- D 2015-09-14T22:52:37.711
 -C Improve\stest\scoverage\sof\sfts5_index.c.
 -D 2015-09-14T19:51:05.852
++C Merge\supdates\sfrom\strunk.
++D 2015-09-14T22:53:07.363
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in f85066ce844a28b671aaeeff320921cd0ce36239
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -1386,10 -1387,7 +1387,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 9a867d9fbe74fe2b33d55e32737a66e9a77b7466
- R 7f32f01a4bbb9942fef5c56e823eae40
- T *branch * mutexInitIsInitReCheck
- T *sym-mutexInitIsInitReCheck *
- T -sym-trunk *
 -P d2df93f26fc0cf6fe01acfeaf2946972e9d8cca2
 -R a767de21459f1cfc9798aa9a41d99081
 -U dan
 -Z 579f9e68a86182329093b3386940c228
++P fea8c0b281b374f2e0b82bec8788275e963a9401 c1f76686cee3918b1be785a4071d68cb3afda0ef
++R 4f41e308e2b7a2e17cf667a1113add7d
 +U mistachkin
- Z eb7dbc33a06a7860a25783953db56f61
++Z e592361607c7e9d2e01634b576352f14
diff --cc manifest.uuid
index 1af6157f49,7a9c2af077..feec750660
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- fea8c0b281b374f2e0b82bec8788275e963a9401
 -c1f76686cee3918b1be785a4071d68cb3afda0ef
++25c157714dc1e89988543d9b7df6b1791911e8a1