]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
Add the "colUsed" field to the sqlite3_index_info structure passed to virtual table...
authordan <dan@noemail.net>
Mon, 30 Nov 2015 12:01:37 +0000 (12:01 +0000)
committerdan <dan@noemail.net>
Mon, 30 Nov 2015 12:01:37 +0000 (12:01 +0000)
FossilOrigin-Name: 47f10b7e5d8c1d965df891990090623444933cc9

1  2 
manifest
manifest.uuid
src/sqlite.h.in

diff --cc manifest
index a4e23dcb0ff06aeaae5ef17c60aca05629ddc149,f8aee8c53319cf9fae6ad3edb78f7d942e074e8a..f39be554daa9da42636d2b1d9b1740d0e2db5c5d
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Simplifications\sto\sthe\slocking\slogic\sin\sthe\sunix-dotfile\sVFS.
- D 2015-11-30T00:05:39.456
+ C Add\sthe\s"colUsed"\sfield\sto\sthe\ssqlite3_index_info\sstructure\spassed\sto\svirtual\stable\sxBestIndex\smethods.\sTo\sindicate\sthe\ssubset\sof\sthe\svirtual\stable\scolumns\sthat\smay\sbe\srequired\sby\sthe\scurrent\sscan.
 -D 2015-11-26T19:33:41.794
++D 2015-11-30T12:01:37.135
  F Makefile.in d828db6afa6c1fa060d01e33e4674408df1942a1
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc e928e68168df69b353300ac87c10105206653a03
@@@ -340,8 -340,8 +340,8 @@@ F src/random.c ba2679f80ec82c4190062d75
  F src/resolve.c f4c897ca76ca6d5e0b3f0499c627392ffe657c8e
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
  F src/select.c e10586c750d87211caa8f4b239e2bfa6a2049e5b
 -F src/shell.c f0f59ea60ad297f671b7ae0fb957a736ad17c92c
 -F src/sqlite.h.in e7eed45d38f9426b7608b761260574d2c61873f1
 +F src/shell.c 2796237990d42e6a5a7beafee65ef70cc8767d21
- F src/sqlite.h.in 4334a48781a59d6cedd99d4033a1febf33e6bd08
++F src/sqlite.h.in 5bd83191711d3dc85030326daa9e8e5226a495e7
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
  F src/sqlite3ext.h 41ef50b0418a7c5ad1337bb80db5a7928dee764f
  F src/sqliteInt.h 64256d193a16a147d9f6317cc4e095fdd3e0a2e9
@@@ -1405,7 -1406,10 +1406,7 @@@ F tool/vdbe_profile.tcl 246d0da094856d7
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 64263ccb8f9835c615242de6e28db24f953422fa
- R dc472c39e1975a0a69aca2b2404edc3d
- U drh
- Z 57f1db7fea7d09de3a215136ff8d3a37
 -P 8b15621952889b4ba53b2ea3171fef7ef0479ddb
 -R 5ccf7ece7a7865caf2729b522847c5bb
 -T *branch * vtab-colused
 -T *sym-vtab-colused *
 -T -sym-trunk *
++P 583813525888c7e106f3e8cb46c1a507006daee6 116b206494eb8ba963c7c5acfbf9e7b6db11c79c
++R 85fc84cc9bc3e1532ec1e735dc703c3b
+ U dan
 -Z 5f2bf909c1f2bf69ad08297f10962d86
++Z eb992ed0e070d727cd79b36741d8ea82
diff --cc manifest.uuid
index edbe835481b1eb6af982febb7e4f9b4030a328a5,f1b8240b4f321f2bdaee0bd5a3836ac86a3882a1..29b821c451b612059d4e7181764c8f676946fc64
@@@ -1,1 -1,1 +1,1 @@@
- 583813525888c7e106f3e8cb46c1a507006daee6
 -116b206494eb8ba963c7c5acfbf9e7b6db11c79c
++47f10b7e5d8c1d965df891990090623444933cc9
diff --cc src/sqlite.h.in
Simple merge