summaryrefslogtreecommitdiff
path: root/sql/sql_string.h
diff options
context:
space:
mode:
authordlenev@brandersnatch.localdomain <>2005-02-15 22:06:55 +0300
committerdlenev@brandersnatch.localdomain <>2005-02-15 22:06:55 +0300
commita3c58bc964033175edceec9f6bc45f60edbedd46 (patch)
tree8192fe16d7f935dac486be99222bde80562ba0e9 /sql/sql_string.h
parent7bc48798fce1b4010adbd074aa18784fcf0eb07e (diff)
downloadmariadb-git-a3c58bc964033175edceec9f6bc45f60edbedd46.tar.gz
Fixing failing -debug build.
Since placement operator delete called only if exception was thrown in constructor and we don't use exceptions in MySQL, there is no sense to do anything in String::delete(void *ptr_arg, MEM_ROOT *mem_root).
Diffstat (limited to 'sql/sql_string.h')
-rw-r--r--sql/sql_string.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_string.h b/sql/sql_string.h
index f9f0b1b6242..2debeb61787 100644
--- a/sql/sql_string.h
+++ b/sql/sql_string.h
@@ -74,7 +74,7 @@ public:
static void operator delete(void *ptr_arg,size_t size)
{ TRASH(ptr_arg, size); }
static void operator delete(void *ptr_arg, MEM_ROOT *mem_root)
- { TRASH(ptr_arg, size); }
+ { /* never called */ }
~String() { free(); }
inline void set_charset(CHARSET_INFO *charset) { str_charset= charset; }