summaryrefslogtreecommitdiff
path: root/sql/sql_string.h
diff options
context:
space:
mode:
authorserg@serg.mylan <>2004-11-28 15:53:17 +0100
committerserg@serg.mylan <>2004-11-28 15:53:17 +0100
commitf09429a4df50ced51afde12130cde47fc030b62a (patch)
tree46d7ffed3e41aa68db463fe32568cb1f56dc23f2 /sql/sql_string.h
parent5b3f7c59eca599c8194da14869410ff0431cf90f (diff)
downloadmariadb-git-f09429a4df50ced51afde12130cde47fc030b62a.tar.gz
protection: TRASH in delete
fixed a bug that it discovered
Diffstat (limited to 'sql/sql_string.h')
-rw-r--r--sql/sql_string.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_string.h b/sql/sql_string.h
index 2101db40f92..cb9db52c830 100644
--- a/sql/sql_string.h
+++ b/sql/sql_string.h
@@ -72,9 +72,9 @@ public:
static void *operator new(size_t size, MEM_ROOT *mem_root)
{ return (void*) alloc_root(mem_root, (uint) size); }
static void operator delete(void *ptr_arg,size_t size)
- {}
+ { TRASH(ptr_arg, size); }
static void operator delete(void *ptr_arg,size_t size, MEM_ROOT *mem_root)
- {}
+ { TRASH(ptr_arg, size); }
~String() { free(); }
inline void set_charset(CHARSET_INFO *charset) { str_charset= charset; }