summaryrefslogtreecommitdiff
path: root/sql/sql_string.h
diff options
context:
space:
mode:
authormonty@mysql.com <>2004-03-05 19:49:50 +0200
committermonty@mysql.com <>2004-03-05 19:49:50 +0200
commit8f093d0fb397b2780c25c233263a8bd842783e5f (patch)
tree4d38939c1f7db4ae8bb4e98725f17b623a00e6c0 /sql/sql_string.h
parentb04915943116e729d9e3c13fa7b30c45a1978952 (diff)
downloadmariadb-git-8f093d0fb397b2780c25c233263a8bd842783e5f.tar.gz
Portability fixes
Diffstat (limited to 'sql/sql_string.h')
-rw-r--r--sql/sql_string.h4
1 files changed, 1 insertions, 3 deletions
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; }