diff options
author | monty@mysql.com <> | 2004-10-22 18:44:51 +0300 |
---|---|---|
committer | monty@mysql.com <> | 2004-10-22 18:44:51 +0300 |
commit | 3afecef4df146c1a44f7f17f640f365e251c4438 (patch) | |
tree | 6faefd7a2f197f4031ef94eb74fc71f8f2936185 /sql/sql_string.h | |
parent | 97b4a3415dd2f107c925496fa5c0c0cd96d5db3c (diff) | |
download | mariadb-git-3afecef4df146c1a44f7f17f640f365e251c4438.tar.gz |
Fix compiler warnings (detected by Intel's C++ compiler)
Fixed checking of privilege handling in CREATE ... SELECT (Bug #6094)
Diffstat (limited to 'sql/sql_string.h')
-rw-r--r-- | sql/sql_string.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/sql_string.h b/sql/sql_string.h index d8c4c3a87a1..2d368991159 100644 --- a/sql/sql_string.h +++ b/sql/sql_string.h @@ -71,7 +71,9 @@ public: } 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 */ + static void operator delete(void *ptr_arg,size_t size) + {} + static void operator delete(void *ptr_arg,size_t size, MEM_ROOT *mem_root) {} ~String() { free(); } |