diff options
| author | unknown <holyfoot@mysql.com> | 2006-06-26 22:32:02 +0500 |
|---|---|---|
| committer | unknown <holyfoot@mysql.com> | 2006-06-26 22:32:02 +0500 |
| commit | 87257abe59af21274e6388418567edd6579de0c5 (patch) | |
| tree | d80a7a0f57c15f731dd1554355161803f69d5c95 /sql/item_geofunc.h | |
| parent | 80bb69ed8fbfce3659868fc22bce32ac4d034d58 (diff) | |
| parent | 31ffea2a08dee857f930936d4d0e38354065c16e (diff) | |
| download | mariadb-git-87257abe59af21274e6388418567edd6579de0c5.tar.gz | |
merging
libmysqld/libmysqld.c:
Auto merged
sql/item_geofunc.h:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'sql/item_geofunc.h')
| -rw-r--r-- | sql/item_geofunc.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/item_geofunc.h b/sql/item_geofunc.h index c45fb88a48a..1f64fdba609 100644 --- a/sql/item_geofunc.h +++ b/sql/item_geofunc.h @@ -32,6 +32,7 @@ public: Item_geometry_func(Item *a,Item *b,Item *c) :Item_str_func(a,b,c) {} Item_geometry_func(List<Item> &list) :Item_str_func(list) {} void fix_length_and_dec(); + enum_field_types field_type() const { return MYSQL_TYPE_GEOMETRY; } }; class Item_func_geometry_from_text: public Item_geometry_func @@ -67,6 +68,7 @@ public: Item_func_as_wkb(Item *a): Item_geometry_func(a) {} const char *func_name() const { return "aswkb"; } String *val_str(String *); + enum_field_types field_type() const { return MYSQL_TYPE_BLOB; } }; class Item_func_geometry_type: public Item_str_func |