From: dan <dan@noemail.net>
Date: Fri, 26 Apr 2013 06:58:06 +0000 (+0000)
Subject: Merge latest trunk changes.
X-Git-Tag: version-3.7.17~50^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0d02dd82921bd9f2fe2efdd5576dfc83f827b842;p=thirdparty%2Fsqlite.git

Merge latest trunk changes.

FossilOrigin-Name: 4d08e74d34e82f3be588049c9576a5c1008435e7
---

0d02dd82921bd9f2fe2efdd5576dfc83f827b842
diff --cc manifest
index 3441db13bd,a3d9885853..31e42e1348
--- a/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Rebalance\sFTS\sexpressions\safter\sparsing\sto\slimit\srecursion\sduring\sevaluation.\sAvoid\srecursion\swhen\sdeleting\sFTS\sexpression\strees.\sEnforce\sa\slimit\son\sthe\sdepth\sof\san\sexpression\stree.
- D 2013-04-25T20:34:02.667
 -C Added\sthe\snextchar.c\sextension.\s\sMinor\schanges\sto\sthe\sspellfix.c\sextension\nso\sthat\sit\scan\sbe\sappended\sto\san\samalgamation\sand\scompiled\swithout\sduplicating\nsymbols.
 -D 2013-04-25T19:31:33.149
++C Merge\slatest\strunk\schanges.
++D 2013-04-26T06:58:06.233
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in 87591ea5bf7d6ed521ad42d5bc69c124debe11a5
+ F Makefile.in ce81671efd6223d19d4c8c6b88ac2c4134427111
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc 67d9db478186d7d4a498c794fff049f7231a9626
+ F Makefile.msc 8f4ee0dab220a5276d5da61149dfd6cd5d1dd5b8
  F Makefile.vxworks db21ed42a01d5740e656b16f92cb5d8d5e5dd315
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
  F VERSION 05c7bd63b96f31cfdef5c766ed91307ac121f5aa
@@@ -83,6 -83,16 +83,16 @@@ F ext/fts3/unicode/mkunicode.tcl 7a9bc0
  F ext/icu/README.txt d9fbbad0c2f647c3fdf715fc9fd64af53aedfc43
  F ext/icu/icu.c eb9ae1d79046bd7871aa97ee6da51eb770134b5a
  F ext/icu/sqliteicu.h 728867a802baa5a96de7495e9689a8e01715ef37
+ F ext/misc/amatch.c 3369b2b544066e620d986f0085d039c77d1ef17f
+ F ext/misc/closure.c fec0c8537c69843e0b7631d500a14c0527962cd6
+ F ext/misc/editdist3.wiki 06100a0c558921a563cbc40e0d0151902b1eef6d
 -F ext/misc/fuzzer.c fb64a15af978ae73fa9075b9b1dfbe82b8defc6f
++F ext/misc/fuzzer.c fb64a15af978ae73fa9075b9b1dfbe82b8defc6f w src/test_fuzzer.c
+ F ext/misc/ieee754.c 2565ce373d842977efe0922dc50b8a41b3289556
+ F ext/misc/nextchar.c 1131e2b36116ffc6fe6b2e3464bfdace27978b1e
 -F ext/misc/regexp.c c25c65fe775f5d9801fb8573e36ebe73f2c0c2e0
 -F ext/misc/spellfix.c e323eebb877d735bc64404c16a6d758ab17a0b7a
++F ext/misc/regexp.c c25c65fe775f5d9801fb8573e36ebe73f2c0c2e0 w src/test_regexp.c
++F ext/misc/spellfix.c e323eebb877d735bc64404c16a6d758ab17a0b7a w src/test_spellfix.c
+ F ext/misc/spellfix1.wiki dd1830444c14cf0f54dd680cc044df2ace2e9d09
 -F ext/misc/wholenumber.c ce362368b9381ea48cbd951ade8df867eeeab014
++F ext/misc/wholenumber.c ce362368b9381ea48cbd951ade8df867eeeab014 w src/test_wholenumber.c
  F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761
  F ext/rtree/rtree.c 757abea591d4ff67c0ff4e8f9776aeda86b18c14
  F ext/rtree/rtree.h 834dbcb82dc85b2481cde6a07cdadfddc99e9b9e
@@@ -1055,10 -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 1a1cf5aa86734c832d845e07780262a178188d56
- R 821db2ca4e9de1c38e42323dffba1c12
- T *branch * fts3-expr-rebalance
- T *sym-fts3-expr-rebalance *
- T -sym-trunk *
 -P aabeea98f53edde68f484f1794ae70789dac3889
 -R 77b136ceb7e3bfd54c75649b938a3e12
 -U drh
 -Z fb4502a56cfa201ec6c890343c386675
++P f968d43f80cc2f236e7d09ba1e8278343e2b6976 56b9a417f5451631f11c5206d625f11472ee65f9
++R 70b7c4a8fc1b35fd998a4752a3b57b39
 +U dan
- Z 130034041e106884ea2e83109b05e05e
++Z 98b8c0af1d54867f961d6716e238405d
diff --cc manifest.uuid
index 7824179050,7c24934462..6ecc568665
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- f968d43f80cc2f236e7d09ba1e8278343e2b6976
 -56b9a417f5451631f11c5206d625f11472ee65f9
++4d08e74d34e82f3be588049c9576a5c1008435e7