diff options
| author | Alexey Botchkov <holyfoot@askmonty.org> | 2011-09-21 13:26:21 +0500 |
|---|---|---|
| committer | Alexey Botchkov <holyfoot@askmonty.org> | 2011-09-21 13:26:21 +0500 |
| commit | d0f2e1e55176c7f674832444ea174c2445058ef7 (patch) | |
| tree | ea09c51b66cf5777b46c34d5ef028bf5c7cddc8f /sql/spatial.h | |
| parent | 6b64baf3b9c8a6c33dd47be62c0b73ab12157760 (diff) | |
| download | mariadb-git-d0f2e1e55176c7f674832444ea174c2445058ef7.tar.gz | |
bug 855336 ST_LENGTH does not work on GEOMETRYCOLLECTIONs fixed.
per-file comments:
mysql-test/r/gis.result
bug 855336 ST_LENGTH does not work on GEOMETRYCOLLECTIONs fixed.
test result updated.
mysql-test/t/gis.test
bug 855336 ST_LENGTH does not work on GEOMETRYCOLLECTIONs fixed.
test case added.
sql/item_geofunc.cc
bug 855336 ST_LENGTH does not work on GEOMETRYCOLLECTIONs fixed.
geom_length() call fixed.
sql/spatial.cc
bug 855336 ST_LENGTH does not work on GEOMETRYCOLLECTIONs fixed.
Geometry_collection::geom_length implemented.
sql/spatial.h
bug 855336 ST_LENGTH does not work on GEOMETRYCOLLECTIONs fixed.
Geometry_collection::geom_length declaration added.
Diffstat (limited to 'sql/spatial.h')
| -rw-r--r-- | sql/spatial.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sql/spatial.h b/sql/spatial.h index cec80b3dacf..d55fc639acc 100644 --- a/sql/spatial.h +++ b/sql/spatial.h @@ -259,7 +259,7 @@ public: virtual bool dimension(uint32 *dim, const char **end) const=0; virtual int get_x(double *x) const { return -1; } virtual int get_y(double *y) const { return -1; } - virtual int geom_length(double *len) const { return -1; } + virtual int geom_length(double *len, const char **end) const { return -1; } virtual int area(double *ar, const char **end) const { return -1;} virtual int is_closed(int *closed) const { return -1; } virtual int num_interior_ring(uint32 *n_int_rings) const { return -1; } @@ -364,6 +364,7 @@ public: return 0; } + int geom_length(double *len, const char **end) const; int area(double *ar, const char **end) const; bool dimension(uint32 *dim, const char **end) const { @@ -388,7 +389,7 @@ public: uint init_from_wkb(const char *wkb, uint len, wkbByteOrder bo, String *res); bool get_data_as_wkt(String *txt, const char **end) const; bool get_mbr(MBR *mbr, const char **end) const; - int geom_length(double *len) const; + int geom_length(double *len, const char **end) const; int area(double *ar, const char **end) const; int is_closed(int *closed) const; int num_points(uint32 *n_points) const; @@ -477,7 +478,7 @@ public: bool get_mbr(MBR *mbr, const char **end) const; int num_geometries(uint32 *num) const; int geometry_n(uint32 num, String *result) const; - int geom_length(double *len) const; + int geom_length(double *len, const char **end) const; int is_closed(int *closed) const; bool dimension(uint32 *dim, const char **end) const { @@ -532,6 +533,7 @@ public: bool get_data_as_wkt(String *txt, const char **end) const; bool get_mbr(MBR *mbr, const char **end) const; int area(double *ar, const char **end) const; + int geom_length(double *len, const char **end) const; int num_geometries(uint32 *num) const; int geometry_n(uint32 num, String *result) const; bool dimension(uint32 *dim, const char **end) const; |