From: dan <dan@noemail.net>
Date: Fri, 26 Apr 2013 14:04:28 +0000 (+0000)
Subject: Merge another trunk change.
X-Git-Tag: version-3.7.17~50^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fheads%2Ffts3-expr-rebalance;p=thirdparty%2Fsqlite.git

Merge another trunk change.

FossilOrigin-Name: 2648966f17bc1b783ef6d3b2368c613f6e02945e
---

2ea54000a139adbe7ddf8054e6a34b1da61bcbd9
diff --cc manifest
index e150e60d93,41113c30a7..48d2a8aa72
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\sharmless\scompiler\swarnings\sin\sthe\sFTS\sexpression\sparser.
- D 2013-04-26T13:14:19.396
 -C Reduce\sthe\sdefault\sSQLITE_MAX_MMAP_SIZE\sslightly\sso\sthat\sit\sfits\sin\sa\nsigned\s32-bit\sinteger.
 -D 2013-04-26T12:08:29.821
++C Merge\sanother\strunk\schange.
++D 2013-04-26T14:04:28.048
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in ce81671efd6223d19d4c8c6b88ac2c4134427111
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -1062,7 -1061,7 +1062,7 @@@ F tool/vdbe-compress.tcl f12c884766bd14
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
  F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
- P 4d08e74d34e82f3be588049c9576a5c1008435e7
- R a62e327052722b023f8b56bfc3226b16
 -P 56b9a417f5451631f11c5206d625f11472ee65f9
 -R 83175c7cd0d9ce60e1daa5a05331eb65
--U drh
- Z 0ddc594c1b1b9290fe656a6228646bb0
 -Z 44151e6d508d016989d25b422911b94b
++P 3c78af8c535e16518f18733325f4cd1df7ec8282 460752b8575320163d2659bb7ff24aff41e2bb66
++R 3adacbaf5ab67ae1f94478e13972158e
++U dan
++Z af116ad57155e6cb0c1adbdd0027b7df
diff --cc manifest.uuid
index 157b4bd510,8936a5bdc4..b388695abd
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 3c78af8c535e16518f18733325f4cd1df7ec8282
 -460752b8575320163d2659bb7ff24aff41e2bb66
++2648966f17bc1b783ef6d3b2368c613f6e02945e