diff options
| author | unknown <serg@serg.mylan> | 2006-01-03 18:12:03 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2006-01-03 18:12:03 +0100 |
| commit | c489cdebeabc88b394f04bf1ae91df3deff602da (patch) | |
| tree | cfc5357eb7d1e59ea0163aa88d31bcf7644151d7 /include | |
| parent | 5e7cbbcbbcb871432cf513c89cd5240c754cde29 (diff) | |
| parent | 307c0b77a191a428c4bfdcba42b53872aa7c917f (diff) | |
| download | mariadb-git-c489cdebeabc88b394f04bf1ae91df3deff602da.tar.gz | |
merged
myisam/mi_delete.c:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_db.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_base.h | 3 |
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 { |