From 6de2ae8372f176817967256d0e6f5a98aad9a2d4 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 15 Feb 2005 22:06:55 +0300 Subject: 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). --- sql/sql_string.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sql/sql_string.h') 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; } -- cgit v1.2.1