From: drh <drh@noemail.net>
Date: Fri, 9 Dec 2011 17:51:30 +0000 (+0000)
Subject: Remove an unnecessary condition.
X-Git-Tag: version-3.7.10~19^2~72^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fheads%2Funinit-vdbe-mem;p=thirdparty%2Fsqlite.git

Remove an unnecessary condition.

FossilOrigin-Name: d9ba023c608bce7768bc08478f9df9243f2e73ce
---

diff --git a/manifest b/manifest
index 838aa0e646..84cc79d6f6 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\san\sunnecessary\sinitialization\sof\sVdbe.aOnceFlag.
-D 2011-12-09T17:38:23.898
+C Remove\san\sunnecessary\scondition.
+D 2011-12-09T17:51:30.877
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5b4a3e12a850b021547e43daf886b25133b44c07
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -243,7 +243,7 @@ F src/vdbe.c 029add0c5197a61db588824a58570547330b9d8f
 F src/vdbe.h 18f581cac1f4339ec3299f3e0cc6e11aec654cdb
 F src/vdbeInt.h 23a9506c9ab31e7823d7257d1828d2d7843443a0
 F src/vdbeapi.c 86189ebba2c49791d75eaa12929f3ce6527596bd
-F src/vdbeaux.c 71a0cd6ae14ddb2e2a6d6b97d5b54ae753272682
+F src/vdbeaux.c ff5eefb43647e1b1e60c1c23407523dbcfd0a86c
 F src/vdbeblob.c 32f2a4899d67f69634ea4dd93e3f651936d732cb
 F src/vdbemem.c 2fc78b3e0fabcc1eaa23cd79dd2e30e6dcfe1e56
 F src/vdbesort.c 468d43c057063e54da4f1988b38b4f46d60e7790
@@ -978,7 +978,7 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
-P 6a9fb47d5060fe641915f5f99cc9265409a4583b
-R c86cf051b4407cf6125edf9f0e3046a6
+P 421714dad32f3460fa40a7f65e9fa276f5e37f58
+R d509edfce30feab29fb6f6730ef15f2e
 U drh
-Z 0944fb1b87cf72506193a8756f5ed350
+Z 197b12cf9381c9c365def8e131bb26a7
diff --git a/manifest.uuid b/manifest.uuid
index 997ba38d98..1c1bcc40a5 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-421714dad32f3460fa40a7f65e9fa276f5e37f58
\ No newline at end of file
+d9ba023c608bce7768bc08478f9df9243f2e73ce
\ No newline at end of file
diff --git a/src/vdbeaux.c b/src/vdbeaux.c
index 8b085ea6ce..c8f6911ae1 100644
--- a/src/vdbeaux.c
+++ b/src/vdbeaux.c
@@ -2136,7 +2136,7 @@ int sqlite3VdbeHalt(Vdbe *p){
   if( p->db->mallocFailed ){
     p->rc = SQLITE_NOMEM;
   }
-  if( p->aOnceFlag ) memset(p->aOnceFlag, 0, p->nOnceFlag);
+  memset(p->aOnceFlag, 0, p->nOnceFlag);
   closeAllCursors(p);
   if( p->magic!=VDBE_MAGIC_RUN ){
     return SQLITE_OK;