]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
Adding the "noskipscan" token to an sqlite_stat1.stat field prevents
authordrh <drh@noemail.net>
Tue, 18 Nov 2014 21:54:31 +0000 (21:54 +0000)
committerdrh <drh@noemail.net>
Tue, 18 Nov 2014 21:54:31 +0000 (21:54 +0000)
an index for being used with the skip-scan algorithm.

FossilOrigin-Name: 4461bf045d8eecf98478035efcdba3f41c709bc5

1  2 
manifest
manifest.uuid
src/where.c

diff --cc manifest
index babbd6680ff179a3de5812b78dedc7dad49139bb,1c607eedd4c332e327fc35381e0be75e219c9e1d..272d0369e12b69c6cf00fc0ae753dad60f133336
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Allow\san\sautomatic\sindex\sto\sbe\sused\sif\sthe\sonly\suses\sof\sdeclared\sindexes\sfor\nthe\ssame\sloop\suse\sthe\sskip-scan\salgorithm.
- D 2014-11-18T21:45:35.209
 -C Adding\sthe\s"noskipscan"\stoken\sto\san\ssqlite_stat1.stat\sfield\sprevents\san\nindex\sfor\sbeing\sused\swith\sthe\sskip-scan\salgorithm.
 -D 2014-11-15T19:08:13.305
++C Adding\sthe\s"noskipscan"\stoken\sto\san\ssqlite_stat1.stat\sfield\sprevents\nan\sindex\sfor\sbeing\sused\swith\sthe\sskip-scan\salgorithm.
++D 2014-11-18T21:54:31.890
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in a226317fdf3f4c895fb3cfedc355b4d0868ce1fb
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -304,7 -304,7 +304,7 @@@ F src/vtab.c 2a30791bbd7926b589401bd09c
  F src/wal.c fa090966140602f03a621f87d82ee69e66ca63b5
  F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
  F src/walker.c c253b95b4ee44b21c406e2a1052636c31ea27804
- F src/where.c 4d72a350fd5eec080583f95044f0f394590d13a3
 -F src/where.c cb89128d24ddb5fe3ca290166d66968f2dc0c3c8
++F src/where.c e275cb74731a3351a9da6ba8280bd5054db6192d
  F src/whereInt.h d3633e9b592103241b74b0ec76185f3e5b8b62e0
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
@@@ -1221,8 -1221,10 +1221,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 296b0c7397790ceadbdb330959e962f6491abc3e 93642a65ef3d53ece322ffd85233b68fc9a86c9d
- R f98024bfef29210e49377c0e9dce233e
- T +closed 93642a65ef3d53ece322ffd85233b68fc9a86c9d
 -P 55e453aadbb676dda07f0fa537d39ce184ef636c
 -R 59717354988087765927b6c6b6246253
 -T *branch * noskipscan-token
 -T *sym-noskipscan-token *
 -T -sym-trunk *
++P c52f7971e90cac1058d6b66c9e334cbc8607def3 00fe09505792cd0d104b2da9d040f023e30fa871
++R 9bae3f4f5e0db167ef1a706a77e76141
++T +closed 00fe09505792cd0d104b2da9d040f023e30fa871
  U drh
- Z 20e5e5ea5bf02fb9cec3c5dbf7f2145d
 -Z 9d226c4fa6bf82a1f1a22a271191f33c
++Z fec927bef6596f9a5e5eec2871a731e7
diff --cc manifest.uuid
index 20c8583760cf89585628c0ce80b262607be7477f,1ab180da3686ad9e00542bb289477182a9c97cd3..fd301fc3c9fcafe4bec6c3b7c3b4c2de7df519f3
@@@ -1,1 -1,1 +1,1 @@@
- c52f7971e90cac1058d6b66c9e334cbc8607def3
 -00fe09505792cd0d104b2da9d040f023e30fa871
++4461bf045d8eecf98478035efcdba3f41c709bc5
diff --cc src/where.c
Simple merge