From 8f093d0fb397b2780c25c233263a8bd842783e5f Mon Sep 17 00:00:00 2001
From: "monty@mysql.com" <>
Date: Fri, 5 Mar 2004 19:49:50 +0200
Subject: Portability fixes

---
 sql/sql_string.h | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'sql/sql_string.h')

diff --git a/sql/sql_string.h b/sql/sql_string.h
index 7f1c56dbfe7..32333b3b381 100644
--- a/sql/sql_string.h
+++ b/sql/sql_string.h
@@ -69,12 +69,10 @@ public:
     Alloced_length=str.Alloced_length; alloced=0; 
     str_charset=str.str_charset;
   }
-  static void *operator new(size_t size)
-  { return (void*) sql_alloc((uint) size); }
   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) /*lint -e715 */
-    { sql_element_free(ptr_arg); }
+    {}
   ~String() { free(); }
 
   inline void set_charset(CHARSET_INFO *charset) { str_charset= charset; }
-- 
cgit v1.2.1