1 files changed, 9 insertions, 1 deletions
diff --git a/sql/sql_cursor.h b/sql/sql_cursor.h
index e07cb9973d1..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 */
@@ -54,9 +54,17 @@ public:
   virtual int open(JOIN *top_level_join)= 0;
   virtual void fetch(ulong num_rows)= 0;
   virtual void close()= 0;
+  virtual bool export_structure(THD *thd, Row_definition_list *defs)
+  {
+    DBUG_ASSERT(0);
+    return true;
+  }
   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 *){}
 };