Take out the PERFECT_MMGR #ifdefs:

My guess is that the thing had bugs, and the pfree was commented out.
The thing is probabally free'ed anyway at the end, so it was not a bad
thing.

If it does cause a bug, it will generate an error when hit, so I say
unless someone else knows, let's remove it and run the regression test.

-Bruce

diff --git a/src/backend/access/hash/hash.c b/src/backend/access/hash/hash.c
index 37ac4d1c700683219337d7a310707830c55e7de6..20a2b65a839bd8d375e57fe58fa877a166098f01 100644 (file)
--- a/src/backend/access/hash/hash.c
+++ b/src/backend/access/hash/hash.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/hash/hash.c,v 1.6 1996/10/23 07:38:29 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/hash/hash.c,v 1.7 1996/10/24 06:30:23 scrappy Exp $
  *
  * NOTES
  *    This file contains only the public interface routines.
@@ -440,9 +440,7 @@ hashendscan(IndexScanDesc scan)
     _hash_dropscan(scan);
     
     /* be tidy */
-#ifdef PERFECT_MMGR
     pfree (scan->opaque);
-#endif /* PERFECT_MMGR */
 }
 
 /*

diff --git a/src/backend/access/nbtree/nbtree.c b/src/backend/access/nbtree/nbtree.c
index ff3c799d53d7238d534bfe9ea163fe2a73e99d23..d157dc75ae3ef7a36cbdd3316608693c44332751 100644 (file)
--- a/src/backend/access/nbtree/nbtree.c
+++ b/src/backend/access/nbtree/nbtree.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtree.c,v 1.5 1996/10/23 07:39:06 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtree.c,v 1.6 1996/10/24 06:30:40 scrappy Exp $
  *
  * NOTES
  *    This file contains only the public interface routines.
@@ -503,11 +503,9 @@ btendscan(IndexScanDesc scan)
     _bt_dropscan(scan);
     
     /* be tidy */
-#ifdef PERFECT_MMGR
     if ( so->keyData != (ScanKey) NULL )
        pfree (so->keyData);
     pfree (scan->opaque);
-#endif /* PERFECT_MMGR */
 }
 
 /*