diff options
| author | monty@mysql.com <> | 2005-02-15 17:12:13 +0200 |
|---|---|---|
| committer | monty@mysql.com <> | 2005-02-15 17:12:13 +0200 |
| commit | 38d1a42481e960eabd302ffce1b1312199416550 (patch) | |
| tree | 15b9cad34a1d5d325aaaa43172f7410440a0e70e /sql/sql_string.h | |
| parent | 410e51c854a929a96f5e91236abe19526ddc4947 (diff) | |
| parent | 44ceb84cdc86f65f9f43424ee1300bb8f162f24b (diff) | |
| download | mariadb-git-38d1a42481e960eabd302ffce1b1312199416550.tar.gz | |
Merge with 4.1
Diffstat (limited to 'sql/sql_string.h')
| -rw-r--r-- | sql/sql_string.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_string.h b/sql/sql_string.h index a5c7cf77630..f9f0b1b6242 100644 --- a/sql/sql_string.h +++ b/sql/sql_string.h @@ -73,7 +73,7 @@ public: { return (void*) alloc_root(mem_root, (uint) size); } static void operator delete(void *ptr_arg,size_t size) { TRASH(ptr_arg, size); } - static void operator delete(void *ptr_arg,size_t size, MEM_ROOT *mem_root) + static void operator delete(void *ptr_arg, MEM_ROOT *mem_root) { TRASH(ptr_arg, size); } ~String() { free(); } |