From 0b4efed236a9a6456c960138421f4b05f3ac086b Mon Sep 17 00:00:00 2001 From: drh Date: Thu, 23 May 2002 13:15:37 +0000 Subject: [PATCH] Fix for ticket #50. (CVS 582) FossilOrigin-Name: 82b74a494ac7c751a13e67dcfa7fffb1b98ec808 --- manifest | 12 ++++++------ manifest.uuid | 2 +- src/main.c | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/manifest b/manifest index 0380718d13..31c51c0543 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Partial\sfix\sfor\sticket\s#49.\s\sThe\scorrect\sresult\sis\scomputed,\sbut\snow\swe\shave\na\smemory\sleak.\s\sI'm\snot\ssure\sif\sthe\smemory\sleak\swas\spre-existing\sor\sa\sresult\nof\sthis\schange.\s(CVS\s581) -D 2002-05-23T12:50:18 +C Fix\sfor\sticket\s#50.\s(CVS\s582) +D 2002-05-23T13:15:37 F Makefile.in 6291a33b87d2a395aafd7646ee1ed562c6f2c28c F Makefile.template 4e11752e0b5c7a043ca50af4296ec562857ba495 F README a4c0ba11354ef6ba0776b400d057c59da47a4cc0 @@ -28,7 +28,7 @@ F src/func.c a31dcba85bc2ecb9b752980289cf7e6cd0cafbce F src/hash.c 6a6236b89c8c060c65dabd300a1c8ce7c10edb72 F src/hash.h dca065dda89d4575f3176e75e9a3dc0f4b4fb8b9 F src/insert.c 5b6586bb5d8306280253829f42f5f98b1455e757 -F src/main.c 1b10b0530cfff19c7a329052b9d91ec7e27dd2aa +F src/main.c 6e53c49a390fabd5fecce9e3b128c61c85208000 F src/md5.c 0ae1f3e2cac92d06fc6246d1b4b8f61a2fe66d3b F src/os.c 5ab8b6b4590d0c1ab8e96c67996c170e4462e0fc F src/os.h 4a361fccfbc4e7609b3e1557f604f94c1e96ad10 @@ -134,7 +134,7 @@ F www/speed.tcl da8afcc1d3ccc5696cfb388a68982bc3d9f7f00f F www/sqlite.tcl 8b5884354cb615049aed83039f8dfe1552a44279 F www/tclsqlite.tcl 1db15abeb446aad0caf0b95b8b9579720e4ea331 F www/vdbe.tcl 2013852c27a02a091d39a766bc87cff329f21218 -P 01ad352c3c82a86d9c94010cbc85d098b8fbc08a -R 6954c5fc1e986ad68e4227930fb35c66 +P 4d27ee411902a197cd72416ca9da9197d3f87f13 +R 42134e515c91a3561726205cb5ceae33 U drh -Z 720e06f7a9829ae7680ef481c9b0c5f4 +Z 5548f4db8a2e3ece93a6ef0eb59cb03c diff --git a/manifest.uuid b/manifest.uuid index d2a9dcd89b..72f38d72c6 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -4d27ee411902a197cd72416ca9da9197d3f87f13 \ No newline at end of file +82b74a494ac7c751a13e67dcfa7fffb1b98ec808 \ No newline at end of file diff --git a/src/main.c b/src/main.c index c1754bd58d..b5f4297835 100644 --- a/src/main.c +++ b/src/main.c @@ -14,7 +14,7 @@ ** other files are for internal use by SQLite and should not be ** accessed by users of the library. ** -** $Id: main.c,v 1.76 2002/05/23 02:09:04 drh Exp $ +** $Id: main.c,v 1.77 2002/05/23 13:15:37 drh Exp $ */ #include "sqliteInt.h" #include "os.h" @@ -401,7 +401,7 @@ static void clearHashTable(sqlite *db, int preserveTemps){ Trigger * pTrigger = sqliteHashData(pElem); Table *pTab = sqliteFindTable(db, pTrigger->table); assert(pTab); - if( pTab->isTemp ){ + if( pTab->isTemp && preserveTemps ){ sqliteHashInsert(&db->trigHash, pTrigger->name, strlen(pTrigger->name), pTrigger); }else{