mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-15 03:17:20 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge mysql.com:/home/hf/work/31155/my50-31155

Browse source 
into  mysql.com:/home/hf/work/31155/my51-31155
This commit is contained in:
holyfoot/hf@hfmain.(none) 2007-10-12 15:33:26 +05:00
commit 44325614ec
4 changed files with 17 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

7
sql/item_geofunc.h
View file

@ -33,7 +33,6 @@ public:
void fix_length_and_dec();
enum_field_types field_type() const { return MYSQL_TYPE_GEOMETRY; }
Field *tmp_table_field(TABLE *t_arg);
virtual int get_geometry_type() const;
bool is_null() { (void) val_int(); return null_value; }
};
@ -92,7 +91,7 @@ public:
Item_func_centroid(Item *a): Item_geometry_func(a) {}
const char *func_name() const { return "centroid"; }
String *val_str(String *);
int get_geometry_type() const;
Field::geometry_type get_geometry_type() const;
};
class Item_func_envelope: public Item_geometry_func
@ -101,7 +100,7 @@ public:
Item_func_envelope(Item *a): Item_geometry_func(a) {}
const char *func_name() const { return "envelope"; }
String *val_str(String *);
int get_geometry_type() const;
Field::geometry_type get_geometry_type() const;
};
class Item_func_point: public Item_geometry_func
@ -111,7 +110,7 @@ public:
Item_func_point(Item *a, Item *b, Item *srid): Item_geometry_func(a, b, srid) {}
const char *func_name() const { return "point"; }
String *val_str(String *);
int get_geometry_type() const;
Field::geometry_type get_geometry_type() const;
};
class Item_func_spatial_decomp: public Item_geometry_func