From: drh <drh@noemail.net>
Date: Mon, 23 Jan 2006 17:43:53 +0000 (+0000)
Subject: Bug fix in the ROWID generation logic of the VDBE.  I think this
X-Git-Tag: version-3.6.10~3159
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=c490e7dc9255265b6fcc8fef2bda5df00e80158b;p=thirdparty%2Fsqlite.git

Bug fix in the ROWID generation logic of the VDBE.  I think this
is a benign bug - it never causes a real fault.  But I am not certain. (CVS 3008)

FossilOrigin-Name: dfe282386896967832826d130323c3ff11532873
---

diff --git a/manifest b/manifest
index d405875286..75dfa1d0ee 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Get\sI/O\serror\stests\sworking\son\swindows.\s(CVS\s3007)
-D 2006-01-23T16:25:22
+C Bug\sfix\sin\sthe\sROWID\sgeneration\slogic\sof\sthe\sVDBE.\s\sI\sthink\sthis\nis\sa\sbenign\sbug\s-\sit\snever\scauses\sa\sreal\sfault.\s\sBut\sI\sam\snot\scertain.\s(CVS\s3008)
+D 2006-01-23T17:43:53
 F Makefile.in ab3ffd8d469cef4477257169b82810030a6bb967
 F Makefile.linux-gcc aee18d8a05546dcf1888bd4547e442008a49a092
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -87,7 +87,7 @@ F src/update.c 14be4ba2f438919b4217085c02feff569e6cf1f2
 F src/utf.c 5ab8ca05d4e9ec81174b010f01ab12a232f0087d
 F src/util.c 82ee598519b8193184bdeab06b51a4ffa05ad60b
 F src/vacuum.c 3865673cc66acd0717ecd517f6b8fdb2a5e7924b
-F src/vdbe.c 1b50083eb941eab37ffa220fdc47cf0965a7f176
+F src/vdbe.c 484a724611113426744caa295be6ee947cc51317
 F src/vdbe.h 8729a4ee16ff9aeab2af9667df3cf300ff978e13
 F src/vdbeInt.h eb3f86ab08ef11635bc78eb88c3ff13f923c233b
 F src/vdbeapi.c dcb2636f49b4807e34960d52a2fc257b3a751140
@@ -344,7 +344,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl a99cf5f6d8bd4d5537584a2b342f0fb9fa601d8b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P 892e644d20b9d132cf29242a9bca0116ebe6968f
-R 433e83df448653f1acd9d8fd6aaee6fb
+P 2ef8b85db7607eb0989c5ecf49cc554fa13d894f
+R a1d12c715f1827a332c0072cf3355030
 U drh
-Z c648ca4416f9c251963aea81faf7a779
+Z 50fc36d002d7ace468096808a4516c0d
diff --git a/manifest.uuid b/manifest.uuid
index c4719af83e..6fc69b6962 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2ef8b85db7607eb0989c5ecf49cc554fa13d894f
\ No newline at end of file
+dfe282386896967832826d130323c3ff11532873
\ No newline at end of file
diff --git a/src/vdbe.c b/src/vdbe.c
index 0f24fb68ec..f3b1a11740 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.536 2006/01/23 13:09:46 danielk1977 Exp $
+** $Id: vdbe.c,v 1.537 2006/01/23 17:43:53 drh Exp $
 */
 #include "sqliteInt.h"
 #include "os.h"
@@ -3280,7 +3280,7 @@ case OP_Insert: {         /* no-push */
 
     if( pOp->p2 & OPFLAG_NCHANGE ) p->nChange++;
     if( pOp->p2 & OPFLAG_LASTROWID ) db->lastRowid = pNos->i;
-    if( pC->nextRowidValid && pTos->i>=pC->nextRowid ){
+    if( pC->nextRowidValid && pNos->i>=pC->nextRowid ){
       pC->nextRowidValid = 0;
     }
     if( pTos->flags & MEM_Null ){