Initialize a local variable so as to avoid a valgrind warning. (CVS 6019)

FossilOrigin-Name: 0d316160fc9e24262457d330abee40f447ff909e

diff --git a/manifest b/manifest
index 084cecb0d9e7583518fc035529becd5ab6d71adf..62ccfbfc09e4cf7e4d413ea5abfd4e4f597970f9 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Removed\sa\sfew\smore\sharmless\swarnings\sfrom\sMSVC.\s(CVS\s6018)
-D 2008-12-11T02:58:27
+C Initialize\sa\slocal\svariable\sso\sas\sto\savoid\sa\svalgrind\swarning.\s(CVS\s6019)
+D 2008-12-11T13:05:00
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in f7e4c81c347b04f7b0f1c1b081a168645d7b8af7
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -194,7 +194,7 @@ F src/update.c 080889d241e4dcd1c545c8051eb6de86f4939295
 F src/utf.c 1da9c832dba0fa8f865b5b902d93f420a1ee4245
 F src/util.c ea62608f66f33a7e8322de83024ae37c415c0c7f
 F src/vacuum.c 383d6297bddc011ab04a9eed110db6eaf523e8e9
-F src/vdbe.c 4b004af10e5dcc5f321cf04ff2688a221443d393
+F src/vdbe.c 3a184e2654f6018b86827e1fa8ec414f9e4daa65
 F src/vdbe.h 03516f28bf5aca00a53c4dccd6c313f96adb94f6
 F src/vdbeInt.h e6e80a99ce634983b7cc2498843b4d2e5540900a
 F src/vdbeapi.c 85c33cfbfa56249cbe627831610afafba754477d
@@ -664,7 +664,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 561d5de16ec07546a3bb691f308fb2495a0d0a43
-R 4cda361f32af13256a1f575246a8d36b
-U shane
-Z d3d1337e638ac64496629d95f970a26f
+P 72fd92bd67ed2b8e193cf3119e60d0a8f1e819c9
+R b4db0147eeda356391c125817ce55909
+U drh
+Z 4957bc7c4749c673c00707dc0c2edafd

diff --git a/manifest.uuid b/manifest.uuid
index e0623b7218fcad64db6d8430add1ef972722b077..0b51ab7389c88b17ee6034c92c1e05105d0c0b4f 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-72fd92bd67ed2b8e193cf3119e60d0a8f1e819c9
\ No newline at end of file
+0d316160fc9e24262457d330abee40f447ff909e
\ No newline at end of file

diff --git a/src/vdbe.c b/src/vdbe.c
index 76f64b46bbbde823cacb088f1d317ad3d5190c3a..9f2019a1fd1228635494dc381fa22c1fc8e87312 100644 (file)
--- 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.797 2008/12/11 02:58:27 shane Exp $
+** $Id: vdbe.c,v 1.798 2008/12/11 13:05:00 drh Exp $
 */
 #include "sqliteInt.h"
 #include <ctype.h>
@@ -3207,7 +3207,7 @@ case OP_NotExists: {        /* jump, in3 */
   assert( i>=0 && i<p->nCursor );
   assert( p->apCsr[i]!=0 );
   if( (pCrsr = (pC = p->apCsr[i])->pCursor)!=0 ){
-    int res;
+    int res = 0;
     u64 iKey;
     assert( pIn3->flags & MEM_Int );
     assert( p->apCsr[i]->isTable );
@@ -3217,11 +3217,6 @@ case OP_NotExists: {        /* jump, in3 */
     pC->rowidIsValid = res==0 ?1:0;
     pC->nullRow = 0;
     pC->cacheStatus = CACHE_STALE;
-    /* res might be uninitialized if rc!=SQLITE_OK.  But if rc!=SQLITE_OK
-    ** processing is about to abort so we really do not care whether or not
-    ** the following jump is taken.  (In other words, do not stress over
-    ** the error that valgrind sometimes shows on the next statement when
-    ** running ioerr.test and similar failure-recovery test scripts.) */
     if( res!=0 ){
       pc = pOp->p2 - 1;
       assert( pC->rowidIsValid==0 );