diff options
author | unknown <timour@askmonty.org> | 2012-11-09 10:11:20 +0200 |
---|---|---|
committer | unknown <timour@askmonty.org> | 2012-11-09 10:11:20 +0200 |
commit | 3f590335363dec43e301fac174f9349233f5804c (patch) | |
tree | 4c3b3e4f9f71cf31cc18cf7d0ba48a3ef3b5c2d3 /sql/spatial.h | |
parent | 94cae65774194f8769b18e6943713d1fed5f89fa (diff) | |
parent | 8df490044cf6fd4a7bcb38cab509975b39b1216d (diff) | |
download | mariadb-git-3f590335363dec43e301fac174f9349233f5804c.tar.gz |
Merge MariaDB 5.1.66 -> 5.2 -> 5.3
Diffstat (limited to 'sql/spatial.h')
-rw-r--r-- | sql/spatial.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sql/spatial.h b/sql/spatial.h index cd29b14ff38..6850cc804d0 100644 --- a/sql/spatial.h +++ b/sql/spatial.h @@ -390,6 +390,10 @@ public: class Gis_line_string: public Geometry { + // Maximum number of points in LineString that can fit into String + static const uint32 max_n_points= + (uint32) (UINT_MAX32 - WKB_HEADER_SIZE - 4 /* n_points */) / + POINT_DATA_SIZE; public: Gis_line_string() {} /* Remove gcc warning */ virtual ~Gis_line_string() {} /* Remove gcc warning */ @@ -450,6 +454,10 @@ public: class Gis_multi_point: public Geometry { + // Maximum number of points in MultiPoint that can fit into String + static const uint32 max_n_points= + (uint32) (UINT_MAX32 - WKB_HEADER_SIZE - 4 /* n_points */) / + (WKB_HEADER_SIZE + POINT_DATA_SIZE); public: Gis_multi_point() {} /* Remove gcc warning */ virtual ~Gis_multi_point() {} /* Remove gcc warning */ |