diff options
| author | unknown <jimw@mysql.com> | 2005-06-09 19:29:55 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-06-09 19:29:55 -0700 |
| commit | 5b81b2dc87261d55b8f18bc89c24a426c35c5603 (patch) | |
| tree | 7b9f0710e776850ddf034f4f8038ccf75689465e /sql/field.h | |
| parent | a3fe14096397ddd8ce7095aad9361c25090569ca (diff) | |
| parent | dd8e174fa6a07ebf21a3b0a03883d2be694b827b (diff) | |
| download | mariadb-git-5b81b2dc87261d55b8f18bc89c24a426c35c5603.tar.gz | |
Merge mysql.com:/home/jimw/my/mysql-5.0-10543
into mysql.com:/home/jimw/my/mysql-5.0-clean
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/sql_table.cc:
Auto merged
Diffstat (limited to 'sql/field.h')
| -rw-r--r-- | sql/field.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/field.h b/sql/field.h index d58746b6068..a522558a8d7 100644 --- a/sql/field.h +++ b/sql/field.h @@ -119,6 +119,7 @@ public: virtual Item_result result_type () const=0; virtual Item_result cmp_type () const { return result_type(); } virtual Item_result cast_to_int_type () const { return result_type(); } + static bool type_can_have_key_part(enum_field_types); static enum_field_types field_type_merge(enum_field_types, enum_field_types); static Item_result result_merge_type(enum_field_types); bool eq(Field *field) |