summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorserg@serg.mylan <>2006-01-16 18:09:04 +0100
committerserg@serg.mylan <>2006-01-16 18:09:04 +0100
commitae3d815b417f2bc63ca4495ccb23b591628f0ff3 (patch)
tree81989cd779b102c585fd676fa196fdd354da443f /include
parent905fdbf195256207325c5f71f0595ed0294aed2a (diff)
parent8dc77f267bc51bab3c449d962ef327c2093e893d (diff)
downloadmariadb-git-ae3d815b417f2bc63ca4495ccb23b591628f0ff3.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
Diffstat (limited to 'include')
-rw-r--r--include/my_base.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/my_base.h b/include/my_base.h
index 8eab79a96fd..77cd60fda92 100644
--- a/include/my_base.h
+++ b/include/my_base.h
@@ -404,7 +404,8 @@ enum ha_base_keytype {
enum en_fieldtype {
FIELD_LAST=-1,FIELD_NORMAL,FIELD_SKIP_ENDSPACE,FIELD_SKIP_PRESPACE,
FIELD_SKIP_ZERO,FIELD_BLOB,FIELD_CONSTANT,FIELD_INTERVALL,FIELD_ZERO,
- FIELD_VARCHAR,FIELD_CHECK
+ FIELD_VARCHAR,FIELD_CHECK,
+ FIELD_enum_val_count
};
enum data_file_type {