summaryrefslogtreecommitdiff
path: root/sql/field.h
diff options
context:
space:
mode:
authorunknown <serg@serg.mylan>2004-11-28 15:53:17 +0100
committerunknown <serg@serg.mylan>2004-11-28 15:53:17 +0100
commit30db8445c10b0ae44077f1b2739a3bb07b4735a4 (patch)
tree46d7ffed3e41aa68db463fe32568cb1f56dc23f2 /sql/field.h
parent7a1ffc062ecfafe9f1f7d4c15d7c8cc9815a7d3d (diff)
downloadmariadb-git-30db8445c10b0ae44077f1b2739a3bb07b4735a4.tar.gz
protection: TRASH in delete
fixed a bug that it discovered include/my_sys.h: move TRASH to my_sys.h from sql_list.h sql/field.h: use TRASH macro sql/item.h: TRASH in delete sql/item_func.h: never delete item's manually! sql/opt_range.cc: TRASH in delete sql/sql_lex.h: TRASH in delete sql/sql_list.h: move TRASH to my_sys.h from sql_list.h sql/sql_parse.cc: don't use properties of deleted objects (even when it's safe) sql/sql_select.cc: TRASH in delete sql/sql_show.cc: TRASH in delete sql/sql_string.h: TRASH in delete
Diffstat (limited to 'sql/field.h')
-rw-r--r--sql/field.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/sql/field.h b/sql/field.h
index 50ea1450085..d1c2fa3b6fd 100644
--- a/sql/field.h
+++ b/sql/field.h
@@ -37,11 +37,7 @@ class Field
void operator=(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 SAFEMALLOC
- bfill(ptr_arg, size, 0x8F);
-#endif
- }
+ static void operator delete(void *ptr_arg, size_t size) { TRASH(ptr_arg, size); }
char *ptr; // Position to field in record
uchar *null_ptr; // Byte where null_bit is