]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
Add the sqlite3_index_info.idxFlags field, allowing xBestIndex() implementations...
authordan <dan@noemail.net>
Tue, 29 Sep 2015 16:47:53 +0000 (16:47 +0000)
committerdan <dan@noemail.net>
Tue, 29 Sep 2015 16:47:53 +0000 (16:47 +0000)
FossilOrigin-Name: a1d08fd3d0419da8c22355d48c6d83eed6fd7e07

1  2 
manifest
manifest.uuid
test/fts3conf.test

diff --cc manifest
index 8f94f97b0e36ea6f02c1b7d99dbccc56cbc3b511,fc874db8fe7ca4e67cdfc2d0459305482e3354fb..35e142bdf3939dc8abdd3d331dabad48ba4eaa6a
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Ensure\sthat\sthe\sxSavepoint()\svirtual\stable\smethod\sis\scorrectly\sinvoked\sif\sthere\sare\salready\sopen\ssavepoints\s(or\sstatement\stransactions)\sthe\sfirst\stime\sa\svirtual\stable\sis\swritten\swithin\sa\stransaction.
- D 2015-09-29T16:41:23.689
 -C Remove\sdead\scode,\sreplacing\swith\sassert()\sstatements\sthat\smake\ssure\sthe\ncode\sreally\swas\sdead.
 -D 2015-09-29T15:50:04.571
++C Add\sthe\ssqlite3_index_info.idxFlags\sfield,\sallowing\sxBestIndex()\simplementations\sto\sspecify\sto\sSQLite\sthat\sa\sstrategy\smay\svisit\sat\smost\sone\srow.\sAdd\ssupport\sfor\sthis\sto\sfts3/4.\sOmit\sthe\sstatement\sjournal\sfrom\svirtual\stable\sUPDATE\sand\sDELETE\soperations\sthat\sare\sguaranteed\snot\sto\saffect\smore\sthan\sone\srow.
++D 2015-09-29T16:47:53.132
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 2143eeef6d0cc26006ae5fc4bb242a4a8b973412
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -690,7 -690,7 +690,7 @@@ F test/fts3aux2.test 7ae2b2c13aefdf4169
  F test/fts3b.test e93bbb653e52afde110ad53bbd793f14fe7a8984
  F test/fts3c.test fc723a9cf10b397fdfc2b32e73c53c8b1ec02958
  F test/fts3comp1.test a0f5b16a2df44dd0b15751787130af2183167c0c
- F test/fts3conf.test 6c7faa66bfb0e90c2c073c029c08b58ea5023922
 -F test/fts3conf.test 92bc4cc67f948b2f53f73c8ab0ebf4be9eee92aa
++F test/fts3conf.test ff90127b2462c788348c0dd7f6f8c573ef9cb5d9
  F test/fts3corrupt.test 2710b77983cc7789295ddbffea52c1d3b7506dbb
  F test/fts3corrupt2.test 6d96efae2f8a6af3eeaf283aba437e6d0e5447ba
  F test/fts3cov.test e0fb00d8b715ddae4a94c305992dfc3ef70353d7
@@@ -1388,7 -1389,7 +1389,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 3a9f076250d9559d8ea94ba44095ba3ddbc5542d
- R 756fa6b717967f5524da70e2a3635809
 -P 59662cd2b65255a30e1a420331c07c51b644621a
 -R cec1f3888d085a601a5cfb22d1afd716
 -U drh
 -Z 0ae71f6c4f92a526967039eb67c1881e
++P 77948b5eceab92a77c39d0864ac15ad453a76fd7 0e317dda5dfd35b742afd70dacb5bfb39aa3fc4a
++R d39a034a4821b5c42018f04d74a8aeb2
 +U dan
- Z 7ea154fd75a363e5d81a988ffd47237f
++Z 28a594c5d9670d5cb6f4428303834152
diff --cc manifest.uuid
index 975366ad0c8b2ca581db1492425402068bca0fb7,e040f5ddfc4ab343d98f9b2da72e9ad478cd0b7f..2b74ea5ad50d33dfbd5ee77849e817b2d5d4d8d8
@@@ -1,1 -1,1 +1,1 @@@
- 77948b5eceab92a77c39d0864ac15ad453a76fd7
 -0e317dda5dfd35b742afd70dacb5bfb39aa3fc4a
++a1d08fd3d0419da8c22355d48c6d83eed6fd7e07
Simple merge