diff options
| author | Alexey Botchkov <holyfoot@askmonty.org> | 2011-09-21 09:29:37 +0500 |
|---|---|---|
| committer | Alexey Botchkov <holyfoot@askmonty.org> | 2011-09-21 09:29:37 +0500 |
| commit | 25b5019c34e717aff95bf405e7d5eb15c2bedf75 (patch) | |
| tree | 8bb2999f4be55900e1867c61973614f05bfff80b /sql/spatial.h | |
| parent | 0249413a6ae4a5900b51f434b361b9efa6133ad1 (diff) | |
| download | mariadb-git-25b5019c34e717aff95bf405e7d5eb15c2bedf75.tar.gz | |
bugs fixed
855253 Compiler error: gcalc_slicescan.cc:2036: error: suggest parentheses around comparison in operand of .|. in maria-5.3-gis
850775 ST_AREA does not work on GEOMETRYCOLLECTIONs in maria-5.3-gis
per-file comments:
mysql-test/r/gis.result
test result updated.
mysql-test/t/gis.test
test case added for 850775.
sql/gcalc_slicescan.cc
compiler error fixed.
sql/spatial.cc
ST_AREA implementation for GEOMETRY_COLLECTION, POINT and LINESTRING.
sql/spatial.h
area() declarations added.
Diffstat (limited to 'sql/spatial.h')
| -rw-r--r-- | sql/spatial.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/spatial.h b/sql/spatial.h index e8f230f9127..eaf048b7a3d 100644 --- a/sql/spatial.h +++ b/sql/spatial.h @@ -375,6 +375,7 @@ public: return 0; } + int area(double *ar, const char **end) const; bool dimension(uint32 *dim, const char **end) const { *dim= 0; @@ -399,6 +400,7 @@ public: 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 area(double *ar, const char **end) const; int is_closed(int *closed) const; int num_points(uint32 *n_points) const; int start_point(String *point) const; @@ -540,6 +542,7 @@ public: uint init_from_opresult(String *bin, const char *opres, uint res_len); 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 num_geometries(uint32 *num) const; int geometry_n(uint32 num, String *result) const; bool dimension(uint32 *dim, const char **end) const; |