diff --git a/sql/field.h b/sql/field.h
index 24faee9d314e57e6d96bb1784be25d434f6bbc3b..7f35b006c038c4a83b6565e89b89b4ab82780dbc 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 22e9ed373862044cf19d2bf546593b3115456d4d..c3b9c7f87eab650cdc247889f129aa7a358192ef 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 */