Merge branch '10.6' into 10.7

3 files changed, 8 insertions, 4 deletions

diff --git a/sql/sql_cursor.h b/sql/sql_cursor.h
index 00b9cd4e67a..b9d0b41ea19 100644
--- a/sql/sql_cursor.h
+++ b/sql/sql_cursor.h
@@ -39,7 +39,7 @@ class JOIN;
   its base class.
 */
 
-class Server_side_cursor: protected Query_arena, public Sql_alloc
+class Server_side_cursor: protected Query_arena
 {
 protected:
   /** Row destination used for fetch */
@@ -61,6 +61,8 @@ public:
   }
   virtual ~Server_side_cursor();
 
+  static void *operator new(size_t size, MEM_ROOT *mem_root)
+  { return alloc_root(mem_root, size); }
   static void operator delete(void *ptr, size_t size);
   static void operator delete(void *, MEM_ROOT *){}
 };
diff --git a/sql/sql_prepare.h b/sql/sql_prepare.h
index d4a03c433b2..1a96df85a19 100644
--- a/sql/sql_prepare.h
+++ b/sql/sql_prepare.h
@@ -115,7 +115,7 @@ class Ed_row;
   automatic type conversion.
 */
 
-class Ed_result_set: public Sql_alloc
+class Ed_result_set
 {
 public:
   operator List<Ed_row>&() { return *m_rows; }
@@ -129,6 +129,8 @@ public:
 
   size_t get_field_count() const { return m_column_count; }
 
+  static void *operator new(size_t size, MEM_ROOT *mem_root)
+  { return alloc_root(mem_root, size); }
   static void operator delete(void *ptr, size_t size) throw ();
   static void operator delete(void *, MEM_ROOT *){}
 private:
diff --git a/sql/threadpool_generic.cc b/sql/threadpool_generic.cc
index c265bc9de8a..eb08441a4d5 100644
--- a/sql/threadpool_generic.cc
+++ b/sql/threadpool_generic.cc
@@ -1746,9 +1746,9 @@ static void print_pool_blocked_message(bool max_threads_reached)
   if (now > pool_block_start + BLOCK_MSG_DELAY && !msg_written)
   {
     if (max_threads_reached)
-      sql_print_error(MAX_THREADS_REACHED_MSG);
+      sql_print_warning(MAX_THREADS_REACHED_MSG);
     else
-      sql_print_error(CREATE_THREAD_ERROR_MSG, my_errno);
+      sql_print_warning(CREATE_THREAD_ERROR_MSG, my_errno);
 
     sql_print_information("Threadpool has been blocked for %u seconds\n",
       (uint)((now- pool_block_start)/1000000));