diff --git a/manifest b/manifest index 3d5c67378c..9ba9626e30 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Test\scases\sto\simprove\scoverage\sof\sbtree.c\s(and\sminor\sbugfixes).\s(CVS\s2191) -D 2005-01-11T10:25:07 +C Remove\sa\sC++\sstyle\scomment\sthat\swent\sin\swith\sthe\sprevious\scommit.\s(CVS\s2192) +D 2005-01-11T11:08:23 F Makefile.in ecf441ac5ca1ccfc8748a8a9537706e69893dfa4 F Makefile.linux-gcc a9e5a0d309fa7c38e7c14d3ecf7690879d3a5457 F README a01693e454a00cc117967e3f9fdab2d4d52e9bc1 @@ -76,7 +76,7 @@ F src/update.c 0979397c41ac29c54fe0cc687a356d8629a633af F src/utf.c e45ce11be6922408cd381561721f6cca7d3b992a F src/util.c 29f43c4a7b9ff29302f7899f793be6836b6cd7f9 F src/vacuum.c 1a9db113a027461daaf44724c71dd1ebbd064203 -F src/vdbe.c c9f00cc0298e025e61b4b65555a4a23dd13325dd +F src/vdbe.c f20455da51615ba185ac3c41416e8714ca84509d F src/vdbe.h 067ca8d6750ba4f69a50284765e5883dee860181 F src/vdbeInt.h 0f74561e629af86172de7cdf0ecaea014c51696c F src/vdbeapi.c 0cf3bdc1072616bedc8eec7fc22e3f5a169d33fd @@ -266,7 +266,7 @@ F www/tclsqlite.tcl e73f8f8e5f20e8277619433f7970060ab01088fc F www/vdbe.tcl 095f106d93875c94b47367384ebc870517431618 F www/version3.tcl 092a01f5ef430d2c4acc0ae558d74c4bb89638a0 F www/whentouse.tcl c3b50d3ac31c54be2a1af9b488a89d22f1e6e746 -P 8ced491588764b1e1066787d0abf3cde8b60970b -R 9631300063f5d334400b6e5706977e76 +P a37e0108dea4896d8aaf84cc590b5cecbdefee6c +R a66eec2a6cf2cb95c24e2e822d8c8a29 U danielk1977 -Z cacca1885cea08f3a5097f0fca56ed7a +Z b88d13fd6460a9f412a6a1a64f3b0e8a diff --git a/manifest.uuid b/manifest.uuid index 4939e23d62..c81d666d46 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -a37e0108dea4896d8aaf84cc590b5cecbdefee6c \ No newline at end of file +ce8e4e885a46cec35b64a81925eb330048ea5cbb \ No newline at end of file diff --git a/src/vdbe.c b/src/vdbe.c index a05345203d..212ff12181 100644 --- a/src/vdbe.c +++ b/src/vdbe.c @@ -43,7 +43,7 @@ ** in this file for details. If in doubt, do not deviate from existing ** commenting and indentation practices when changing or adding code. ** -** $Id: vdbe.c,v 1.438 2005/01/11 10:25:08 danielk1977 Exp $ +** $Id: vdbe.c,v 1.439 2005/01/11 11:08:23 danielk1977 Exp $ */ #include "sqliteInt.h" #include "os.h" @@ -2804,18 +2804,16 @@ case OP_NotExists: { assert( i>=0 && inCursor ); assert( p->apCsr[i]!=0 ); if( (pCrsr = (pC = p->apCsr[i])->pCursor)!=0 ){ - int res, rx; + int res; u64 iKey; assert( pTos->flags & MEM_Int ); assert( p->apCsr[i]->intKey ); iKey = intToKey(pTos->i); - // rx = sqlite3BtreeMoveto(pCrsr, 0, iKey, &res); rc = sqlite3BtreeMoveto(pCrsr, 0, iKey, &res); pC->lastRecno = pTos->i; pC->recnoIsValid = res==0; pC->nullRow = 0; pC->cacheValid = 0; - // if( rx!=SQLITE_OK || res!=0 ){ if( res!=0 ){ pc = pOp->p2 - 1; pC->recnoIsValid = 0;