diff options
| author | drh <drh@noemail.net> | 2013-08-02 20:44:48 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2013-08-02 20:44:48 +0000 |
| commit | 7fb30bd0dd4057c203415b7d1d0fe0a15e25a8f7 (patch) | |
| tree | dd7ab4cd95b8b32df8e8f92df1ed4234744c2da1 /src/select.c | |
| parent | 6f855952d07e32967b84c790201da4b45d849722 (diff) | |
| parent | e0c7efd9ae6706b5e39093bcf2256569032c2b91 (diff) | |
| download | sqlite-7fb30bd0dd4057c203415b7d1d0fe0a15e25a8f7.tar.gz sqlite-7fb30bd0dd4057c203415b7d1d0fe0a15e25a8f7.zip | |
Merge in the latest trunk changes, including partial indexes, the MAX_PATH
fix in os_win.c, and the sqlite3_cancel_auto_extension() API.
FossilOrigin-Name: 7e1acb390770d1bd189fac7a3a7f96106f96e3a4
Diffstat (limited to 'src/select.c')
| -rw-r--r-- | src/select.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/select.c b/src/select.c index fa35f4587..014feca8f 100644 --- a/src/select.c +++ b/src/select.c @@ -4177,7 +4177,7 @@ int sqlite3Select( ** Use the SQLITE_GroupByOrder flag with SQLITE_TESTCTRL_OPTIMIZER ** to disable this optimization for testing purposes. */ - if( sqlite3ExprListCompare(p->pGroupBy, pOrderBy)==0 + if( sqlite3ExprListCompare(p->pGroupBy, pOrderBy, -1)==0 && OptimizationEnabled(db, SQLITE_GroupByOrder) ){ pOrderBy = 0; } @@ -4198,7 +4198,7 @@ int sqlite3Select( ** BY and DISTINCT, and an index or separate temp-table for the other. */ if( (p->selFlags & (SF_Distinct|SF_Aggregate))==SF_Distinct - && sqlite3ExprListCompare(pOrderBy, p->pEList)==0 + && sqlite3ExprListCompare(pOrderBy, p->pEList, -1)==0 ){ p->selFlags &= ~SF_Distinct; p->pGroupBy = sqlite3ExprListDup(db, p->pEList, 0); |