summaryrefslogtreecommitdiff
path: root/sql/field.h
diff options
context:
space:
mode:
authorjimw@mysql.com <>2005-06-09 19:29:55 -0700
committerjimw@mysql.com <>2005-06-09 19:29:55 -0700
commit1055c3600089480b5f3b88af3515c2c09f2605cc (patch)
tree7b9f0710e776850ddf034f4f8038ccf75689465e /sql/field.h
parent153f233627489bee542787ea0f0aa8b8270c67b6 (diff)
parentd147e69bb756202d05243ccec48c220f896237af (diff)
downloadmariadb-git-1055c3600089480b5f3b88af3515c2c09f2605cc.tar.gz
Merge mysql.com:/home/jimw/my/mysql-5.0-10543
into mysql.com:/home/jimw/my/mysql-5.0-clean
Diffstat (limited to 'sql/field.h')
-rw-r--r--sql/field.h1
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)