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).
This commit is contained in:
parent
7bc48798fc
commit
a3c58bc964
@ -74,7 +74,7 @@ public:
|
|||||||
static void operator delete(void *ptr_arg,size_t size)
|
static void operator delete(void *ptr_arg,size_t size)
|
||||||
{ TRASH(ptr_arg, size); }
|
{ TRASH(ptr_arg, size); }
|
||||||
static void operator delete(void *ptr_arg, MEM_ROOT *mem_root)
|
static void operator delete(void *ptr_arg, MEM_ROOT *mem_root)
|
||||||
{ TRASH(ptr_arg, size); }
|
{ /* never called */ }
|
||||||
~String() { free(); }
|
~String() { free(); }
|
||||||
|
|
||||||
inline void set_charset(CHARSET_INFO *charset) { str_charset= charset; }
|
inline void set_charset(CHARSET_INFO *charset) { str_charset= charset; }
|
||||||
|
Loading…
x
Reference in New Issue
Block a user