10.0-base merge

1 files changed, 7 insertions, 1 deletions

diff --git a/sql/sql_error.h b/sql/sql_error.h
index f11ce6dcf0d..fadd3b51ec6 100644
--- a/sql/sql_error.h
+++ b/sql/sql_error.h
@@ -367,15 +367,21 @@ class Warning_info
 
   /** Indicates if push_warning() allows unlimited number of warnings. */
   bool               m_allow_unlimited_warnings;
+  bool		     initialized;    /* Set to 1 if init() has been called */
 
 private:
   Warning_info(const Warning_info &rhs); /* Not implemented */
   Warning_info& operator=(const Warning_info &rhs); /* Not implemented */
 public:
 
-  Warning_info(ulonglong warn_id_arg, bool allow_unlimited_warnings);
+  Warning_info(ulonglong warn_id_arg, bool allow_unlimited_warnings,
+               bool initialize=true);
   ~Warning_info();
 
+  /* Allocate memory for structures */
+  void init();
+  void free_memory();
+
   /**
     Reset the warning information. Clear all warnings,
     the number of warnings, reset current row counter