summaryrefslogtreecommitdiff
path: root/sql/mysql_priv.h
diff options
context:
space:
mode:
authortsmith@maint1.mysql.com <>2007-07-04 22:38:53 +0200
committertsmith@maint1.mysql.com <>2007-07-04 22:38:53 +0200
commit54253a0763de6032ee65edf11a92a19cfaa3312f (patch)
treeb22b114d06b831ce6fc24f9e2d881ea6f872d459 /sql/mysql_priv.h
parent0a1c65b6e3fe1f3cec4aa8a6cea0dd4acb51887a (diff)
parent1b8165b052275497531243426ccdea6fe8289e8a (diff)
downloadmariadb-git-54253a0763de6032ee65edf11a92a19cfaa3312f.tar.gz
Merge maint1.mysql.com:/data/localhome/tsmith/bk/51
into maint1.mysql.com:/data/localhome/tsmith/bk/maint/51
Diffstat (limited to 'sql/mysql_priv.h')
-rw-r--r--sql/mysql_priv.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h
index ae7c4ca5f3f..98c06148313 100644
--- a/sql/mysql_priv.h
+++ b/sql/mysql_priv.h
@@ -574,6 +574,13 @@ enum enum_parsing_place
struct st_table;
class THD;
+enum enum_check_fields
+{
+ CHECK_FIELD_IGNORE,
+ CHECK_FIELD_WARN,
+ CHECK_FIELD_ERROR_FOR_NULL
+};
+
/* Struct to handle simple linked lists */
typedef struct st_sql_list {