Temporary commit of merge of MariaDB 10.0-base and MySQL 5.6

1 files changed, 10 insertions, 0 deletions

diff --git a/sql/sql_error.h b/sql/sql_error.h
index 00ade934226..79633ae5df8 100644
--- a/sql/sql_error.h
+++ b/sql/sql_error.h
@@ -20,6 +20,8 @@
 #include "m_string.h" /* LEX_STRING */
 #include "sql_string.h"                        /* String */
 #include "mysql_com.h" /* MYSQL_ERRMSG_SIZE */
+#include "my_time.h"   /* MYSQL_TIME */
+#include "decimal.h"
 
 class THD;
 
@@ -319,6 +321,14 @@ private:
   MEM_ROOT *m_mem_root;
 };
 
+class Sql_condition : public MYSQL_ERROR
+{
+  /*
+    Wrapper class to allow one to use Sql_condition in handlers instead of
+    MYSQL_ERROR
+   */
+};
+
 ///////////////////////////////////////////////////////////////////////////
 
 /**