Remove redundant assert() statement from vdbeaux.c. Ticket #3065. (CVS 5039)

FossilOrigin-Name: 3cba1166076bf0506597e2d7686a271922817668

diff --git a/manifest b/manifest
index d9a6c648b74375c45ee04bf717338e25f3e88d9c..02bb049032ef247fe5fe1a17f37741f55db0119d 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sversion\scomment\sto\svdbeaux.c.\sNo\scode\schanges.\sTicket\s#3066.\s(CVS\s5038)
-D 2008-04-24T08:31:52
+C Remove\sredundant\sassert()\sstatement\sfrom\svdbeaux.c.\sTicket\s#3065.\s(CVS\s5039)
+D 2008-04-24T08:36:51
 F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7
 F Makefile.in 25b3282a4ac39388632c2fb0e044ff494d490952
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -178,7 +178,7 @@ F src/vdbe.c e0cc1de84b470acd90e6d62a833d09aa531e11d7
 F src/vdbe.h bfd84bda447f39cb599302c7ec85067dae20453c
 F src/vdbeInt.h 05316345da487b0cf540482576f9ae3337d133cd
 F src/vdbeapi.c 0e1b5a808bb0e556f2a975eb7d11fd3153e922bf
-F src/vdbeaux.c 0aa45610bbe442d097a3bb04994bbf34e8411689
+F src/vdbeaux.c f18c0d2c47877d2ac7bdbf694ecd7b031d43b43a
 F src/vdbeblob.c cc713c142c3d4952b380c98ee035f850830ddbdb
 F src/vdbefifo.c a30c237b2a3577e1415fb6e288cbb6b8ed1e5736
 F src/vdbemem.c 237e61216381998ff71c6431e5e7bd03386f6225
@@ -635,7 +635,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P 1518e8542cebd977d46e720544bfad16d3f8895e
-R 5fb6d15319f6f7ad5d83871547c67dd6
+P d667add44b87f9011b0ef10d45101dfc1e38feaa
+R 503f300221e44200adbebd9f53f6b02b
 U danielk1977
-Z eadc7d17f185104033abdb2824b7e07c
+Z a6019c4f46408df421bfe3dfcaf397a4

diff --git a/manifest.uuid b/manifest.uuid
index 0d4110dab82cf54d99a54ad95170862ad9968f96..7d88d33a76650e5c102cab4027e9882731cf4bad 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d667add44b87f9011b0ef10d45101dfc1e38feaa
\ No newline at end of file
+3cba1166076bf0506597e2d7686a271922817668
\ No newline at end of file

diff --git a/src/vdbeaux.c b/src/vdbeaux.c
index e9d481f14961a9c15b6e128f4405051a5669d6d0..c46214a3af25bf0067e774367e1442ac3e7d1ebc 100644 (file)
--- a/src/vdbeaux.c
+++ b/src/vdbeaux.c
@@ -14,7 +14,7 @@
 ** to version 2.8.7, all this code was combined into the vdbe.c source file.
 ** But that file was getting too big so this subroutines were split out.
 **
-** $Id: vdbeaux.c,v 1.377 2008/04/24 08:31:52 danielk1977 Exp $
+** $Id: vdbeaux.c,v 1.378 2008/04/24 08:36:51 danielk1977 Exp $
 */
 #include "sqliteInt.h"
 #include <ctype.h>
@@ -1656,7 +1656,6 @@ int sqlite3VdbeHalt(Vdbe *p){
   if( p->db->mallocFailed ){
     p->rc = SQLITE_NOMEM;
   }
-  checkActiveVdbeCnt(db);
 
   return SQLITE_OK;
 }