From: drh <drh@noemail.net>
Date: Sat, 26 May 2018 20:04:20 +0000 (+0000)
Subject: Merge the ability to plan virtual table queries using overloaded functions.
X-Git-Tag: version-3.25.0~60^2~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0624282e5e3c726e46add44815919f5f1533d741;p=thirdparty%2Fsqlite.git

Merge the ability to plan virtual table queries using overloaded functions.

FossilOrigin-Name: 2c2a202c14fa8803fb1e4b7356cbc9cd49e65a27e19bf6e3fd0e9dff9d5c67f9
---

0624282e5e3c726e46add44815919f5f1533d741
diff --cc manifest
index ead659468d,b86958ab3e..697e8ec3e0
--- a/manifest
+++ b/manifest
@@@ -1,10 -1,10 +1,10 @@@
- C Minor\scorrection.
- D 2018-05-26T12:21:21.540
 -C Experimental\schange\sthat\sallows\soverloaded\sfunctions\sto\sbe\sanalyzed\sby\nthe\sxBestIndex\smethod\sand\sused\sby\sthe\sxFilter\smethod\sof\sa\svirtual\stable.
 -D 2018-05-26T18:03:48.120
++C Merge\sthe\sability\sto\splan\svirtual\stable\squeries\susing\soverloaded\sfunctions.
++D 2018-05-26T20:04:20.602
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 -F Makefile.in bfc40f350586923e0419d2ea4b559c37ec10ee4b6e210e08c14401f8e340f0da
 +F Makefile.in 51407f0e371dcb9e65d368bd4f1a08fc17ef8361ff11aac9356f0f63693b38dd
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 -F Makefile.msc 681fb88cccf1fd58c0b9648f6a09b75332206ef72ca76012ad11699c320cec5f
 +F Makefile.msc 550559948ff2bfccff07186842fcae6c25ec93468f42bace545761543f07c25d
  F README.md 7764d56778d567913ef11c82da9ab94aefa0826f7c243351e4e2d7adaef6f373
  F VERSION b7c9d1d11cb70ef8e90cfcf3c944aa58a9f801cc2ad487eebb0a110c16dfc2df
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -1730,7 -1729,10 +1730,7 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P b27451910b6880b166d4777e05b14ab2731c3483b5ed0f42c459bbb61c6cd095
- R 0e7fa04f7ff537a47acee804207d1995
 -P 777189ce88799f93f393fd14fd716111c85bcdcb23690fd561f78ea2bd2ce5da
 -R 287ad6e657f697576be6591ee557b37e
 -T *branch * vtab-func-constraint
 -T *sym-vtab-func-constraint *
 -T -sym-trunk *
++P f20d9a99a477e1d592edb37d741d9d07b015d6772b4c8cf1541ef290d600ca6b a353b1d7ee6c5989ba1b98a3990c9a4c2ff39ae66572fd1200606e8ef585e5fa
++R d256b525ac9e702b0664a64df9682a20
  U drh
- Z e132f6a792319f62f6944c0a7e6e7692
 -Z 1dcaa168f6b87a9c36f55e4d22ec80f8
++Z f8a76c3e458db30f1b8629c3dda523fc
diff --cc manifest.uuid
index c1b230bdb5,bf9a43fb0d..7ce57aa5c8
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- f20d9a99a477e1d592edb37d741d9d07b015d6772b4c8cf1541ef290d600ca6b
 -a353b1d7ee6c5989ba1b98a3990c9a4c2ff39ae66572fd1200606e8ef585e5fa
++2c2a202c14fa8803fb1e4b7356cbc9cd49e65a27e19bf6e3fd0e9dff9d5c67f9