From: drh <drh@noemail.net>
Date: Wed, 18 Jun 2014 15:11:54 +0000 (+0000)
Subject: Prevent an automatic index from taking the place of a declared index.
X-Git-Tag: version-3.8.6~107
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f9944b5053632fd64457f87a49d500c8114082a1;p=thirdparty%2Fsqlite.git

Prevent an automatic index from taking the place of a declared index.

FossilOrigin-Name: 0a52bddd9db49b2b79fc24888b50023d0fe74f7b
---

f9944b5053632fd64457f87a49d500c8114082a1
diff --cc manifest
index 8cea868013,3e9fb58638..e6ed1d11b8
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\sa\smissing\sspace\sin\sa\s"wheretrace"\scomment.\s\sNo\schanges\sto\sproduction\scode.
- D 2014-06-17T17:00:42.928
+ C Prevent\san\sautomatic\sindex\sfrom\staking\sthe\splace\sof\sa\sdeclared\sindex.
 -D 2014-06-17T20:16:43.699
++D 2014-06-18T15:11:54.897
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in ed5e4aae4799f724699d5509fac2977786414dbb
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -296,7 -296,7 +296,7 @@@ F src/vtab.c 21b932841e51ebd7d075e2d0ad
  F src/wal.c 264df50a1b33124130b23180ded2e2c5663c652a
  F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
  F src/walker.c 11edb74d587bc87b33ca96a5173e3ec1b8389e45
- F src/where.c 7f59d3786a41ccb8d76148405f76c31658527c08
 -F src/where.c 0035f45de6a2f248e2ac57da16460858b2166089
++F src/where.c 7b9e13cff91a2f14ac61e6a1bc3a83b5113e6298
  F src/whereInt.h 929c1349b5355fd44f22cee5c14d72b3329c58a6
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
@@@ -1178,7 -1179,7 +1179,8 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 38965484199153e3e5b999f5196c1d66e5296f60
- R 8d914acb455fa768c8bfdec56d9704e4
 -P ffe3fea47b8ba8ec4557f68243ef3ef5aac00dfd
 -R b60de90301b6f096aa7fa9280f014db5
++P b500f2a09721b49c95a69c47a0205bc2375af2cd 4ece839d445ff578a449a339ab579a32e64c9d28
++R 1a9a8498bcd344a9075e008919374ef9
++T +closed 4ece839d445ff578a449a339ab579a32e64c9d28
  U drh
- Z d423ee25f70180aacb18e67f6dbb4662
 -Z 58155d377c73e3b2e02e7af08e490e72
++Z c3c3ed7d30575f073ff51d887a334d78
diff --cc manifest.uuid
index 0e6051ab6d,175b6dda01..585f159241
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- b500f2a09721b49c95a69c47a0205bc2375af2cd
 -4ece839d445ff578a449a339ab579a32e64c9d28
++0a52bddd9db49b2b79fc24888b50023d0fe74f7b