diff options
| author | unknown <serg@serg.mylan> | 2006-01-16 18:09:04 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2006-01-16 18:09:04 +0100 |
| commit | ad5ac3f8979fffef52a94d3dd69b80eb4e329c30 (patch) | |
| tree | 81989cd779b102c585fd676fa196fdd354da443f /include | |
| parent | a4a906b9716ee2a447bd83996b6abe5482cd0e02 (diff) | |
| parent | e931d813e175630e102bc7b8b60ba4d399c283dd (diff) | |
| download | mariadb-git-ad5ac3f8979fffef52a94d3dd69b80eb4e329c30.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
client/mysqldump.c:
Auto merged
sql/field.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_handler.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 { |