From: dan <dan@noemail.net>
Date: Mon, 29 Jul 2019 15:32:01 +0000 (+0000)
Subject: When using an index for both DISTINCT and ORDER BY, do not confuse the number of... 
X-Git-Tag: version-3.30.0~187
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ed9d12dbc216d6eac10e186b756582bf1c3ff18d;p=thirdparty%2Fsqlite.git

When using an index for both DISTINCT and ORDER BY, do not confuse the number of columns required for distinctness with the number required to get the correct sort order. Fix for [6749cb3c].

FossilOrigin-Name: 6ac0f822450b26c7d67c33cdb2a90189cd3cf65a052af8497b795c3f71a23813
---

ed9d12dbc216d6eac10e186b756582bf1c3ff18d
diff --cc manifest
index 182dcc8dd1,a333edf327..69d017d307
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\sthe\sOP_Affinity\soperator\sso\sthat\swhen\sapplying\sREAL\saffinity,\sit\nonly\ssets\sMEM_IntReal\sif\sthe\sinteger\svalue\swill\sfit\sin\s6\sbytes\sor\sless.\nFix\sfor\sticket\s[ba2f4585cf495231]
- D 2019-07-29T06:06:53.317
+ C When\susing\san\sindex\sfor\sboth\sDISTINCT\sand\sORDER\sBY,\sdo\snot\sconfuse\sthe\snumber\sof\scolumns\srequired\sfor\sdistinctness\swith\sthe\snumber\srequired\sto\sget\sthe\scorrect\ssort\sorder.\sFix\sfor\s[6749cb3c].
 -D 2019-07-29T14:42:56.109
++D 2019-07-29T15:32:01.641
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -1838,7 -1838,10 +1838,8 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P cea8a892f76bddc63b921ffc11ea8dce8f8cf649a2c77aa908c7c5c91eed7f4c
- R a0bdb430e67719a9d96ef868306325b9
- U drh
- Z ff81b1edb3c7d78332a1b9e4fd7361e9
 -P 6bfa44da226fd758a2ee924d1e8e3a742b0635b6d3f922a4a7919cb14b2418e6
 -R 41a42b5a743b4824fb1ffd95dbeba40a
 -T *branch * tkt-6749cb3c
 -T *sym-tkt-6749cb3c *
 -T -sym-trunk *
++P 2b221bb15fd2b9f6a426e5eb439f7dbabbe3c4cab010c49b87dae3bb1f16c081 b47169319ad88e8ffdbe8fbb91f4cced81ebd5c0ee1b018be2d0256c9a1c5159
++R ffca6544c35b35a1077b7fc419306dbe
++T +closed b47169319ad88e8ffdbe8fbb91f4cced81ebd5c0ee1b018be2d0256c9a1c5159
+ U dan
 -Z 23a64fa9e8cd65c1486338cedc3724c0
++Z 1ada3406a2249a9b51e11c7a4e4d08f2
diff --cc manifest.uuid
index 098e3f4806,bcb651e360..461db1d4c2
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 2b221bb15fd2b9f6a426e5eb439f7dbabbe3c4cab010c49b87dae3bb1f16c081
 -b47169319ad88e8ffdbe8fbb91f4cced81ebd5c0ee1b018be2d0256c9a1c5159
++6ac0f822450b26c7d67c33cdb2a90189cd3cf65a052af8497b795c3f71a23813