From: dan <dan@noemail.net>
Date: Tue, 11 Aug 2015 14:25:34 +0000 (+0000)
Subject: Merge fixes from the fts5NoWarn branch.
X-Git-Tag: version-3.9.0~227
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f053ceb9c1839989f512c397b8d7b0633d82620a;p=thirdparty%2Fsqlite.git

Merge fixes from the fts5NoWarn branch.

FossilOrigin-Name: 61cb2fc6c12810863c965c74e90bc502e20cf810
---

f053ceb9c1839989f512c397b8d7b0633d82620a
diff --cc manifest
index 29bb3f9b7a,165102fb14..ba0b4f4ad2
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\scompiler\swarnings\sand\sremove\sunreachable\scode.
- D 2015-08-08T23:30:56.001
 -C Fix\sharmless\scompiler\swarnings\sin\sFTS5\scode.
 -D 2015-08-06T03:19:14.454
++C Merge\sfixes\sfrom\sthe\sfts5NoWarn\sbranch.
++D 2015-08-11T14:25:34.036
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 2fc9ca6bf5949d415801c007ed3004a4bdb7c380
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -1372,8 -1370,10 +1372,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 1d75a41bb2f7fcd32f9f08768517b814e452e456 962b6cd6bbc1ef82ae98cb2ddf41e7a1116e70f5
- R 9515e6f89ec29f4ddd4e24f2f6aa441a
- T +closed 962b6cd6bbc1ef82ae98cb2ddf41e7a1116e70f5
- U drh
- Z 835c78eb4169c17715bf2b1e3d1fbe33
 -P 483ebe8989ed7dbe197fe84e3eef6e76fa828e14
 -R 2cffeaf7c9a72e7585a8552d3dbd52fa
 -T *branch * fts5NoWarn
 -T *sym-fts5NoWarn *
 -T -sym-trunk *
 -U mistachkin
 -Z c163b66ce8f67976ab7189b5c285d710
++P fd5608fb20831f1f1946c8941445b7acc463a143 0ddb2532b2daaaf1b0109ac360822f84cb999b7f
++R f656c6f9b0efdad10e9de9eeca5d30e2
++U dan
++Z a8d5c370bccbd577084eb4f30439c21a
diff --cc manifest.uuid
index 907ce0deb8,beaefde0be..c74c503c56
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- fd5608fb20831f1f1946c8941445b7acc463a143
 -0ddb2532b2daaaf1b0109ac360822f84cb999b7f
++61cb2fc6c12810863c965c74e90bc502e20cf810