diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-12 01:01:03 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-12 01:01:04 +0100 |
| commit | 11d7788c18bf062c204782b3661e67b45e818819 (patch) | |
| tree | 7e6df60892757c060ecf9d2698b893f8b93315e7 /src/3rdparty/sqlite/sqlite3.c | |
| parent | b3c0e9afa0041d4d45e47880732deda1dd1013b9 (diff) | |
| parent | 3162345670ffe67a71a62abaeda0d8eb8ad0682e (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I69238f23882deebeaad46e4fdcf899ab22cc2b8f
Diffstat (limited to 'src/3rdparty/sqlite/sqlite3.c')
| -rw-r--r-- | src/3rdparty/sqlite/sqlite3.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/3rdparty/sqlite/sqlite3.c b/src/3rdparty/sqlite/sqlite3.c index 8fd740b300..bd647ca1c2 100644 --- a/src/3rdparty/sqlite/sqlite3.c +++ b/src/3rdparty/sqlite/sqlite3.c @@ -131679,6 +131679,7 @@ SQLITE_PRIVATE int sqlite3Select( */ if( (p->selFlags & (SF_Distinct|SF_Aggregate))==SF_Distinct && sqlite3ExprListCompare(sSort.pOrderBy, pEList, -1)==0 + && p->pWin==0 ){ p->selFlags &= ~SF_Distinct; pGroupBy = p->pGroupBy = sqlite3ExprListDup(db, pEList, 0); |