From: drh <drh@noemail.net>
Date: Wed, 24 Jun 2015 18:22:51 +0000 (+0000)
Subject: Add "ON CONFLICT" handling to the spellfix module.
X-Git-Tag: version-3.8.11~131
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=619a111e05b658ece539d12eeee7b9095dbbb44b;p=thirdparty%2Fsqlite.git

Add "ON CONFLICT" handling to the spellfix module.

FossilOrigin-Name: 07937a81c6c90eb7491a843eb65183805f5b675e
---

619a111e05b658ece539d12eeee7b9095dbbb44b
diff --cc manifest
index ddf5ffe11c,2372b073fe..25648e5651
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C In\sthe\sfuzzcheck\stest\sprogram,\suse\sthe\sprogress\shandler\sto\slimit\sthe\snumber\nof\sVDBE\scycles\sto\savoid\sgetting\sstuck\sif\sthe\sSQL\sunder\stest\scontains\san\ninfinite\sCTE\sloop.\s\sAdd\sthe\s--limit-vdbe\scommand-line\soption.
- D 2015-06-24T14:45:44.257
+ C Add\s"ON\sCONFLICT"\shandling\sto\sthe\sspellfix\smodule.
 -D 2015-06-24T17:21:52.413
++D 2015-06-24T18:22:51.190
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 1063c58075b7400d93326b0eb332b48a54f53025
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -1286,7 -1286,10 +1286,8 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P b41ef5d6db107cac2b1b46a955e63414434ee976
- R 906785d44a97778169ea8177629aec9d
 -P fbf9c4325e98120914bb03bdf351b57643f7a8c8
++P fbf9c4325e98120914bb03bdf351b57643f7a8c8 1d04def785b6031de68b7f199d400cbb5c76caea
+ R de10737ebdc70bb8182e7abe767d84f9
 -T *branch * spellfix-constraints
 -T *sym-spellfix-constraints *
 -T -sym-trunk *
 -U dan
 -Z fa582c8ac482ee4085cd5a29af44e41f
++T +closed 1d04def785b6031de68b7f199d400cbb5c76caea
 +U drh
- Z 5a5062bd8b43ef3a45689ba975547888
++Z eeb6ef6607f26af62ae9a0b6e717ca6b
diff --cc manifest.uuid
index a33822f17d,6b677d1c3c..ba84fdf913
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- fbf9c4325e98120914bb03bdf351b57643f7a8c8
 -1d04def785b6031de68b7f199d400cbb5c76caea
++07937a81c6c90eb7491a843eb65183805f5b675e