merge with 5.1

1 files changed, 7 insertions, 3 deletions

diff --git a/sql/sql_string.h b/sql/sql_string.h
index e595de47f99..0b521eb6f49 100644
--- a/sql/sql_string.h
+++ b/sql/sql_string.h
@@ -95,9 +95,13 @@ public:
   }
   static void *operator new(size_t size, MEM_ROOT *mem_root) throw ()
   { 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, MEM_ROOT *mem_root)
+  static void operator delete(void *ptr_arg, size_t size)
+  {
+    (void) ptr_arg;
+    (void) size;
+    TRASH(ptr_arg, size);
+  }
+  static void operator delete(void *, MEM_ROOT *)
   { /* never called */ }
   ~String() { free(); }