From 5c19e4f09e5c8f07e6060df4e590575efb4c9ec8 Mon Sep 17 00:00:00 2001
From: unknown <serg@serg.mylan>
Date: Mon, 26 Jul 2004 21:33:42 +0200
Subject: [PATCH] safemalloc always resets the free'd memory, not only when
 PEDANTIC_SAFEMALLOC

---
 sql/field.h    | 2 +-
 sql/sql_list.h | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sql/field.h b/sql/field.h
index 24faee9d314..7f35b006c03 100644
--- a/sql/field.h
+++ b/sql/field.h
@@ -38,7 +38,7 @@ class Field
 public:
   static void *operator new(size_t size) {return (void*) sql_alloc((uint) size); }
   static void operator delete(void *ptr_arg, size_t size) {
-#ifdef PEDANTIC_SAFEMALLOC
+#ifdef SAFEMALLOC
     bfill(ptr_arg, size, 0x8F);
 #endif
   }
diff --git a/sql/sql_list.h b/sql/sql_list.h
index 22e9ed37386..c3b9c7f87ea 100644
--- a/sql/sql_list.h
+++ b/sql/sql_list.h
@@ -19,9 +19,9 @@
 #pragma interface			/* gcc class implementation */
 #endif
 
-/* mysql standard class memoryallocator */
+/* mysql standard class memory allocator */
 
-#ifdef PEDANTIC_SAFEMALLOC
+#ifdef SAFEMALLOC
 #define TRASH(XX,YY) bfill((XX), (YY), 0x8F)
 #else
 #define TRASH(XX,YY) /* no-op */
-- 
2.30.9