Free Mem.z buffers when a vdbe statement is reset. (CVS 5002)

FossilOrigin-Name: 0bedbe092aa3079dc49157a9bcaa7716b00e0bdb

diff --git a/manifest b/manifest
index 3f420321c7253108780f2cae560e425c4b9abee1..79112ac2195cb024750b89e5c46728f4d45aa351 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Cleanup\ssome\s#ifdefs\sto\smake\stheir\smeaning\sclearly.\s\sNo\slogical\schanges.\s(CVS\s5001)
-D 2008-04-14T14:34:44
+C Free\sMem.z\sbuffers\swhen\sa\svdbe\sstatement\sis\sreset.\s(CVS\s5002)
+D 2008-04-14T15:15:23
 F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7
 F Makefile.in 25b3282a4ac39388632c2fb0e044ff494d490952
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -178,7 +178,7 @@ F src/vacuum.c 3524411bfb58aac0d87eadd3e5b7cd532772af30
 F src/vdbe.c 444ab9ecc91f3c04b2b29ae604458426aa674fa6
 F src/vdbe.h bfd84bda447f39cb599302c7ec85067dae20453c
 F src/vdbeInt.h 0b96efdeecb0803e504bf1c16b198f87c91d6019
-F src/vdbeapi.c ab6e99f8a6b7fcb82c2c698da7a36762a7593f0a
+F src/vdbeapi.c 0e1b5a808bb0e556f2a975eb7d11fd3153e922bf
 F src/vdbeaux.c f7460fac0c61d90edb245c66b7ac35254868c8e5
 F src/vdbeblob.c cc713c142c3d4952b380c98ee035f850830ddbdb
 F src/vdbefifo.c a30c237b2a3577e1415fb6e288cbb6b8ed1e5736
@@ -628,7 +628,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P e2e1ca818c5f77abdb423aebe34eea80b2fb84b2
-R 070d93fdfd2475b1822d91bc6a8443c8
-U drh
-Z d6b5d3094aaf1f820631db011bdb1544
+P b8bc5f3a83408375cfbff90e2c574fb8996dfbd9
+R db8c293aa09600c96ac4c3e529b1a93d
+U danielk1977
+Z 57ccd5b8d61ec4e5dd551ec146834ef4

diff --git a/manifest.uuid b/manifest.uuid
index 734694d33737b66334c321395fbfb1f5e1128c06..1c7caf57de060820ca59a800759f633798ab0e8d 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b8bc5f3a83408375cfbff90e2c574fb8996dfbd9
\ No newline at end of file
+0bedbe092aa3079dc49157a9bcaa7716b00e0bdb
\ No newline at end of file

diff --git a/src/vdbeapi.c b/src/vdbeapi.c
index 7a52087304a673700bfa9380bcb57d49de9662df..fdb585acf6b91c219b388ec101f87bf4570592eb 100644 (file)
--- a/src/vdbeapi.c
+++ b/src/vdbeapi.c
@@ -224,7 +224,7 @@ int sqlite3_reset(sqlite3_stmt *pStmt){
   }else{
     Vdbe *v = (Vdbe*)pStmt;
     sqlite3_mutex_enter(v->db->mutex);
-    rc = sqlite3VdbeReset(v, 0);
+    rc = sqlite3VdbeReset(v, 1);
     stmtLruAdd(v);
     sqlite3VdbeMakeReady(v, -1, 0, 0, 0);
     assert( (rc & (v->db->errMask))==rc );