From: drh <drh@noemail.net>
Date: Mon, 16 Jul 2012 23:13:19 +0000 (+0000)
Subject: Merge the spellfix1 changes for supporting matchlen into trunk.
X-Git-Tag: version-3.7.14~64
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=206d0b616419f8951c60ec74ad1370dfa92e1b03;p=thirdparty%2Fsqlite.git

Merge the spellfix1 changes for supporting matchlen into trunk.

FossilOrigin-Name: 6f167adf6050632e8c52f9ac4fb5583bcf27c576
---

206d0b616419f8951c60ec74ad1370dfa92e1b03
diff --cc manifest
index ba54373845,3f4d31497d..8fdf833849
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C If\sa\sspecific\sdatabase\sis\snominated\sas\spart\sof\sa\s"PRAGMA\sintegrity_check"\sor\s"PRAGMA\squick_check"\scommand,\ssearch\sfor\sproblems\sin\sthe\snominated\sdatabase\sonly.\si.e.\s"PRAGMA\smain.quick_check"\snow\sonly\sscans\sthe\smain\sdatabase,\snot\sall\sattached\sdatabases\sas\sbefore.
- D 2012-07-16T10:06:12.788
 -C Fix\scompiler\swarnings\sabout\sunused\scode\sin\sspellfix.\s\sFix\sthe\seditDist3Core()\nroutine\sto\sreturn\sthe\smatchlen\sin\scharacters\sinstead\sof\sbytes.
 -D 2012-07-16T22:16:44.619
++C Merge\sthe\sspellfix1\schanges\sfor\ssupporting\smatchlen\sinto\strunk.
++D 2012-07-16T23:13:19.737
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 8f6d858bf3df9978ba43df19985146a1173025e4
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -1004,7 -1005,7 +1005,7 @@@ F tool/tostr.awk e75472c2f98dd76e06b8c9
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
- P cba2a65870481df213e006b07e74f0ca19d2d57c
- R 2c8947c00bca721d7703f91176d94433
- U dan
- Z f57f4dc603e6879ace3edbe2fb8156d2
 -P 6333b42dd292e8e567c3fce1c371d6f58021af88
++P 4353e40b74f577f224f190c429bfe03cf6a5c6d6 f96d4e7bd7d81b05b1490bf5d79c77ff583e444c
+ R 30ab5f90b7df8ebe4d6fa220655edbc4
+ U drh
 -Z d0f2f984dce6f521f6a371c3f57d729a
++Z 5a5e4c2b59deca5c96bae885212173df
diff --cc manifest.uuid
index c37c8336d7,efc4ac1f2a..f2743547c6
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 4353e40b74f577f224f190c429bfe03cf6a5c6d6
 -f96d4e7bd7d81b05b1490bf5d79c77ff583e444c
++6f167adf6050632e8c52f9ac4fb5583bcf27c576