From: drh <drh@noemail.net>
Date: Tue, 2 Jun 2015 16:19:56 +0000 (+0000)
Subject: Rename SQLITE_AFF_NONE to SQLITE_AFF_BLOB to avoid confusion with
X-Git-Tag: version-3.8.11~184
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a88994ee57b6010caaa9e532917d7538dcc1bf12;p=thirdparty%2Fsqlite.git

Rename SQLITE_AFF_NONE to SQLITE_AFF_BLOB to avoid confusion with
"no affinity".

FossilOrigin-Name: 29ad9e917330969810ac1bc685bba4282401bdae
---

a88994ee57b6010caaa9e532917d7538dcc1bf12
diff --cc manifest
index 84ea37edf4,0403efeca2..337a86f9f6
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\sa\sfaulty\sassert()\sin\sbtree.c.\s\sUpdate\sthe\sdatabase\sfuzz\stest\sfile\swith\nnew\stest\scases.
- D 2015-06-02T14:02:18.322
 -C Rename\sSQLITE_AFF_NONE\sto\sSQLITE_AFF_BLOB.
 -D 2015-06-02T15:32:08.579
++C Rename\sSQLITE_AFF_NONE\sto\sSQLITE_AFF_BLOB\sto\savoid\sconfusion\swith\n"no\saffinity".
++D 2015-06-02T16:19:56.840
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 994bab32a3a69e0c35bd148b65cde49879772964
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -1281,7 -1281,10 +1281,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P f925389eaf5bf8962a28fcaa652b75caa606efba
- R ae4a37b7f156067ca4ef803074aa5dc0
 -P 4e621af1345a001360938de76e3b0a14deb5e991
++P 4e621af1345a001360938de76e3b0a14deb5e991 bce3f04186cd2d69414a5a98b5b77dc8f060554a
+ R ee13a8dd8e0014c6c36d8309e414bd72
 -T *branch * blob-affinity-rename
 -T *sym-blob-affinity-rename *
 -T -sym-trunk *
  U drh
- Z d6aea5d5b820e4f6ddc306cbfe7d28b3
 -Z 3dc5f9f8176f1194f0510f7321cda212
++Z 7bcfea926bf6cb138b5a18403403f3f4
diff --cc manifest.uuid
index a97991bf5c,90256eb79a..c4fdc8af1e
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 4e621af1345a001360938de76e3b0a14deb5e991
 -bce3f04186cd2d69414a5a98b5b77dc8f060554a
++29ad9e917330969810ac1bc685bba4282401bdae