10.0-base merge

(without InnoDB - all InnoDB changes were ignored)

1 files changed, 14 insertions, 0 deletions

diff --git a/sql/sql_error.h b/sql/sql_error.h
index fadd3b51ec6..ae9ef9f8d47 100644
--- a/sql/sql_error.h
+++ b/sql/sql_error.h
@@ -197,6 +197,17 @@ public:
   ~MYSQL_ERROR()
   {}
 
+  /** check if condition was handled by a condition handler */
+  bool handled() const
+  {
+    return m_handled;
+  }
+  /** mark that condition was handled */
+  void mark_handled()
+  {
+    m_handled= 1;
+  }
+
 private:
   /*
     The interface of MYSQL_ERROR is mostly private, by design,
@@ -310,6 +321,9 @@ private:
   /** MySQL extension, MYSQL_ERRNO condition item. */
   uint m_sql_errno;
 
+  /** Marker if error/warning was handled by a continue handler */
+  bool m_handled;
+
   /**
     SQL RETURNED_SQLSTATE condition item.
     This member is always NUL terminated.