Merge branch '10.1' into 10.2

1 files changed, 10 insertions, 0 deletions

diff --git a/mysys/my_new.cc b/mysys/my_new.cc
index 4266452da43..a401ccff135 100644
--- a/mysys/my_new.cc
+++ b/mysys/my_new.cc
@@ -47,6 +47,11 @@ void* operator new[](std::size_t sz, const std::nothrow_t&) throw()
   return (void *) my_malloc (sz ? sz : 1, MYF(0));
 }
 
+void operator delete (void *ptr, std::size_t)
+{
+  my_free(ptr);
+}
+
 void operator delete (void *ptr)
 {
   my_free(ptr);
@@ -57,6 +62,11 @@ void operator delete[] (void *ptr) throw ()
   my_free(ptr);
 }
 
+void operator delete[] (void *ptr, std::size_t) throw ()
+{
+  my_free(ptr);
+}
+
 void operator delete(void* ptr, const std::nothrow_t&) throw()
 {
   my_free(ptr);