aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--manifest12
-rw-r--r--manifest.uuid2
-rw-r--r--src/select.c5
3 files changed, 10 insertions, 9 deletions
diff --git a/manifest b/manifest
index 48bf70707..de57fc8ab 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Where\spossible,\stransform\sthe\sDISTINCT\squalifier\sto\sa\sGROUP\sBY\sclause.\sGROUP\sBY\sclauses\smay\sbe\soptimized\sby\sindices,\sDISTINCT\squalifiers\scannot.\s(CVS\s4538)
-D 2007-11-12T15:29:19
+C Fix\sa\scode\scomment\sin\sselect.c.\sNo\scode\schanges.\s(CVS\s4539)
+D 2007-11-12T15:40:42
F Makefile.in 30c7e3ba426ddb253b8ef037d1873425da6009a8
F Makefile.linux-gcc 65241babba6faf1152bf86574477baab19190499
F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -128,7 +128,7 @@ F src/pragma.c 363e548dafb52327face8d99757ab56a7b1c1b26
F src/prepare.c 663284f62a73a48b89f5f4e769e155fefba60384
F src/printf.c 96c8d55315a13fc53cb3754cb15046f3ff891ea2
F src/random.c 4a22746501bf36b0a088c66e38dde5daba6a35da
-F src/select.c 19fb48509aa5dbdda5f31b92eec6743535dc0316
+F src/select.c aef87a179e287c4ab864cb927c1e95f5ee66bf45
F src/server.c 087b92a39d883e3fa113cae259d64e4c7438bc96
F src/shell.c 0b9dd90afc34f28b8786638155d32f6248d0bf0a
F src/sqlite.h.in 3844177d389d58bd4a8be4ee81eefb01a084ed72
@@ -586,7 +586,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P 06749ac7afeea4adbdeb9315f3819d5224534c66
-R d3236e16fe589d623a588d0fca905a2c
+P e56331234791cf3d830a30e4cfa66682bdf2eed1
+R 951a097fbbb24a975791f93cbe995c02
U danielk1977
-Z e2a2364ba8c7fed549c957127a8396b6
+Z 063c20c543ab435cbe9b4000bec9ea90
diff --git a/manifest.uuid b/manifest.uuid
index d638b79ec..90ff68e34 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e56331234791cf3d830a30e4cfa66682bdf2eed1 \ No newline at end of file
+cf41d6a00f658d2cd64ff9811a3b1270ad1a580b \ No newline at end of file
diff --git a/src/select.c b/src/select.c
index 7298251c2..f165a221f 100644
--- a/src/select.c
+++ b/src/select.c
@@ -12,7 +12,7 @@
** This file contains C code routines that are called by the parser
** to handle SELECT statements in SQLite.
**
-** $Id: select.c,v 1.360 2007/11/12 15:29:19 danielk1977 Exp $
+** $Id: select.c,v 1.361 2007/11/12 15:40:42 danielk1977 Exp $
*/
#include "sqliteInt.h"
@@ -3067,7 +3067,8 @@ int sqlite3Select(
}
#endif
- /* If possible, rewrite the query to use GROUP BY instead of
+ /* If possible, rewrite the query to use GROUP BY instead of DISTINCT.
+ ** GROUP BY may use an index, DISTINCT never does.
*/
if( p->isDistinct && !p->isAgg && !p->pGroupBy ){
p->pGroupBy = sqlite3ExprListDup(db, p->pEList);