diff --git a/extra/yassl/taocrypt/mySTL/algorithm.hpp b/extra/yassl/taocrypt/mySTL/algorithm.hpp
index d8bc29a0bb9..f6a29cf4bdb 100644
--- a/extra/yassl/taocrypt/mySTL/algorithm.hpp
+++ b/extra/yassl/taocrypt/mySTL/algorithm.hpp
@@ -27,6 +27,8 @@
 
 namespace mySTL {
 
+#undef max
+#undef min
 
 template<typename T>
 inline const T& max(const T& a, const T&b)
diff --git a/sql/sql_list.h b/sql/sql_list.h
index d16fbaf2e50..af30cbe0d6a 100644
--- a/sql/sql_list.h
+++ b/sql/sql_list.h
@@ -38,6 +38,8 @@ public:
   static void operator delete(void *ptr, size_t size) { TRASH(ptr, size); }
   static void operator delete(void *ptr, MEM_ROOT *mem_root)
   { /* never called */ }
+  static void operator delete[](void *ptr, MEM_ROOT *mem_root)
+  { /* never called */ }
   static void operator delete[](void *ptr, size_t size) { TRASH(ptr, size); }
 #ifdef HAVE_purify
   bool dummy;