diff options
| author | unknown <jani@a193-229-222-105.elisa-laajakaista.fi> | 2006-02-05 11:06:29 +0200 |
|---|---|---|
| committer | unknown <jani@a193-229-222-105.elisa-laajakaista.fi> | 2006-02-05 11:06:29 +0200 |
| commit | fd03e915ea8278a3f4f604e815302f05dbf042e7 (patch) | |
| tree | 388a5c39bbaaa03a0899af811382b027e9edda81 /include | |
| parent | 4f40b7be9abe32bf7216541bcab68261fb4ea7ac (diff) | |
| parent | fb84189349c1e3af2df8ae03e3030611b715652a (diff) | |
| download | mariadb-git-fd03e915ea8278a3f4f604e815302f05dbf042e7.tar.gz | |
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new
configure.in:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.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 5962775fb57..168625f4a87 100644 --- a/include/my_base.h +++ b/include/my_base.h @@ -426,7 +426,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 { |