:-) (CVS 28)

FossilOrigin-Name: 57c5add197c12c919e2556b5ac421803398f2c1b

diff --git a/manifest b/manifest
index 79a3d1eb2df9b0dee1db21b2e78b6f4595b1f496..9454a21529b8d57dbae248e768e0da511fa0a06e 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C added\sDISTINCT\son\sselect\s(CVS\s27)
-D 2000-05-31T20:00:52
+C :-)\s(CVS\s28)
+D 2000-05-31T21:06:30
 F COPYRIGHT 74a8a6531a42e124df07ab5599aad63870fa0bd4
 F Makefile.in 7ac2fef265940d93a544cb454efa836451559a71
 F README 6b5960603c7f8bf42fc022b4b6436f242f238dbb
@@ -7,7 +7,7 @@ F configure 00a5b5c82147a576fa6e82d7c1b0d55c321d6d2c x
 F configure.in 6ccfd5fc80517f7cfe605a7fc7e0f62d962a233c
 F doc/lemon.html e233a3e97a779c7a87e1bc4528c664a58e49dd47
 F src/build.c 03f83e95d46e328a2ac08aace102b142ea38e6d7
-F src/dbbe.c 80080f5ef2297e54797ee24f5951dab1c39af5d5
+F src/dbbe.c 3635022e50ab1632825be6a14f74eb29014e895f
 F src/dbbe.h 0147c9f8539d421d6c5558d3e854b78387372fae
 F src/delete.c 16ef3418b19be9ab39db836c693970ca7bbff605
 F src/expr.c 91970700e3e39b2b725b028c166f588a5bb0c038
@@ -42,10 +42,10 @@ F tool/opNames.awk 2bd9071a138e4e2be13dc98fe066398a61219e1e
 F tool/opcodeDoc.awk b3a2a3d5d3075b8bd90b7afe24283efdd586659c
 F tool/renumberOps.awk 6d067177ad5f8d711b79577b462da9b3634bd0a9
 F www/c_interface.tcl f875864edf7974157d1c257ca08de854660882a5
-F www/changes.tcl 995d64c96978a996f0e9e46f2ce896355a7c87a7
+F www/changes.tcl 37f4906f0b03f2160d2b2e4ed3cedb0b91d253cb
 F www/index.tcl a94e31dc690f07b0dfdb82c5ab6315e4840a336d
 F www/sqlite.tcl 7deb564df188ad4523adecfe2365de6d09f6dfd9
-P 0b7d9eb8ad771917c53587ea4d674f7e8d76121f
-R 73a74ce4d5a10f11090cf328a18ab074
+P 1f0c4ffd98591e506201b6b0e6e60b9216ceb596
+R 0f2e2968ed9c0d0c28efc76f372593a3
 U drh
-Z ef837be79fdfd30ace7832037467a189
+Z 0827c57252d4cd13107c7c9e774afaee

diff --git a/manifest.uuid b/manifest.uuid
index 30c7fcabd8b699ad6613de34cd3a6c046793af77..5c9a0c08903d6bdf122793809721cf59a0615a1e 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-1f0c4ffd98591e506201b6b0e6e60b9216ceb596
\ No newline at end of file
+57c5add197c12c919e2556b5ac421803398f2c1b
\ No newline at end of file

diff --git a/src/dbbe.c b/src/dbbe.c
index edbdccf2f2d52abb57caae55c3fb22b0906a3684..c6040bae0ce6057db2b36a6afe716c0e3c16b0f0 100644 (file)
--- a/src/dbbe.c
+++ b/src/dbbe.c
@@ -30,7 +30,7 @@
 ** relatively simple to convert to a different database such
 ** as NDBM, SDBM, or BerkeleyDB.
 **
-** $Id: dbbe.c,v 1.4 2000/05/31 20:00:52 drh Exp $
+** $Id: dbbe.c,v 1.5 2000/05/31 21:06:30 drh Exp $
 */
 #include "sqliteInt.h"
 #include <gdbm.h>
@@ -202,7 +202,7 @@ static void randomName(struct rc4 *pRc4, char *zBuf, char *zPrefix){
   strcpy(zBuf, zPrefix);
   j = strlen(zBuf);
   for(i=0; i<15; i++){
-    int c = (rc4byte(pRc4) & 0x7f) % (sizeof(zRandomChars) - 1);
+    int c = rc4byte(pRc4) % (sizeof(zRandomChars) - 1);
     zBuf[j++] = zRandomChars[c];
   }
   zBuf[j] = 0;
@@ -249,7 +249,7 @@ DbbeTable *sqliteDbbeOpenTable(
     if( pFile->zName ){
       pFile->dbf = gdbm_open(pFile->zName, 0, GDBM_WRCREAT|GDBM_FAST, 0640, 0);
     }else{
-      int i, j, limit;
+      int limit;
       struct rc4 *pRc4;
       char zRandom[50];
       pRc4 = &pBe->rc4;
@@ -560,7 +560,7 @@ FILE *sqliteDbbeOpenTempFile(Dbbe *pBe){
     randomName(&pBe->rc4, zBuf, "/_temp_file_");
     sqliteFree(zFile);
     sqliteSetString(&zFile, pBe->zDir, zBuf, 0);
-  }while( access(zFile,0) && limit-- >= 0 );
+  }while( access(zFile,0)==0 && limit-- >= 0 );
   pBe->apTemp[i] = fopen(zFile, "w+");
   sqliteFree(zFile);
   return pBe->apTemp[i];

diff --git a/www/changes.tcl b/www/changes.tcl
index e1e1c86b2b0cc1cddeeedde0a47a70718760ecb9..5c0ab2ed893e17aa05416867fd239550d4397c82 100644 (file)
--- a/www/changes.tcl
+++ b/www/changes.tcl
@@ -20,6 +20,7 @@ proc chng {date desc} {
 chng {2000 May 31} {
 <li>Added support for aggregate functions (Ex: <b>COUNT(*)</b>, <b>MIN(...)</b>)
 to the SELECT statement.</li>
+<li>Added support for <B>SELECT DISTINCT ...</B></li>
 }
 
 chng {2000 May 30} {