Commit 8ed7805c authored by unknown's avatar unknown
Browse files

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).
parent c60b1846

sql/sql_string.h

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ class String 
  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; }