:-) (CVS 61)

FossilOrigin-Name: 25984b4d3ce0f94fa98a159d840cc7bd4e8bc1ab

diff --git a/manifest b/manifest
index 7b83ba4a2b8025e9fbe7e1d20a727eaccd22118d..838a7424c2a72517d96fa67647f65c70310ae525 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C :-)\s(CVS\s60)
-D 2000-06-06T18:24:42
+C :-)\s(CVS\s61)
+D 2000-06-06T19:18:24
 F COPYRIGHT 74a8a6531a42e124df07ab5599aad63870fa0bd4
 F Makefile.in 17ba1ccf8d2d40c627796bba8f72952365d6d644
 F README 51f6a4e7408b34afa5bc1c0485f61b6a4efb6958
@@ -22,7 +22,7 @@ F src/tclsqlite.c 9f358618ae803bedf4fb96da5154fd45023bc1f7
 F src/tokenize.c 32f0579d4a7276b8e3bfd353cac034f67976aa82
 F src/update.c 18746f920f989b3d19d96c08263c92584823cd35
 F src/util.c 33f9baa01e45394ef0cf85361a0e872987884315
-F src/vdbe.c 7a4909b44a58a81e03dfc9376b926d5e8f773fcc
+F src/vdbe.c 73c93464c40866f11156bc5b0f19baf6ec851e7a
 F src/vdbe.h 49e0f9c6742860e224cd81d1278059f5d029dfb6
 F src/where.c c9b90e7672f4662a83ef9a27a193020d69fe034c
 F test/all.test 0950c135cab7e60c07bd745ccfad1476211e5bd7
@@ -50,7 +50,7 @@ F www/c_interface.tcl 9ac800854272db5fe439e07b7435b243a5422293
 F www/changes.tcl f5839fe8de7449d994c71a8e48ce8ea736bec7d1
 F www/index.tcl 0c63672bad5188327143ecd0a07c7c0741ff9823
 F www/sqlite.tcl 2f933ce18cffd34a0a020a82435ab937137970fd
-P a8fa6719d55b43f8d194aecfcae5af42d17742af
-R 333a72b8cbe1c9e8e0a8e67f537bc389
+P 4eca3bf64fd96303bee653b7e44fa7bbdfccbdfb
+R 361d483638ebf01832ee4fb64c6b45f1
 U drh
-Z 9bbf407a7faf03509fc8b4c0594de30c
+Z a433e93955d8d7af421e38bc9064d041

diff --git a/manifest.uuid b/manifest.uuid
index 9e5e503220cd488e39e53175436524ab8504612d..bd674b170bed7e506e09bd6c5605fcee4a7cec35 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4eca3bf64fd96303bee653b7e44fa7bbdfccbdfb
\ No newline at end of file
+25984b4d3ce0f94fa98a159d840cc7bd4e8bc1ab
\ No newline at end of file

diff --git a/src/vdbe.c b/src/vdbe.c
index e80a1d4e7479fdeb69a0a3e2a7e2111c428f18e9..f159fef5426e0d2474f9e581d6ccf03fc2b85b1a 100644 (file)
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -41,7 +41,7 @@
 ** But other routines are also provided to help in building up
 ** a program instruction by instruction.
 **
-** $Id: vdbe.c,v 1.21 2000/06/06 17:27:06 drh Exp $
+** $Id: vdbe.c,v 1.22 2000/06/06 19:18:24 drh Exp $
 */
 #include "sqliteInt.h"
 #include <unistd.h>
@@ -2820,7 +2820,7 @@ int sqliteVdbeExec(
           sqliteFree(p->agg.apHash);
           p->agg.apHash = 0;
           p->agg.pCurrent = p->agg.pFirst;
-        }else if( p->agg.pCurrent==p->agg.pFirst ){
+        }else if( p->agg.pCurrent==p->agg.pFirst && p->agg.pCurrent!=0 ){
           int i;
           AggElem *pElem = p->agg.pCurrent;
           for(i=0; i<p->agg.nMem; i++){