diff options
| author | Igor Babaev <igor@askmonty.org> | 2013-08-18 19:58:51 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2013-08-18 19:58:51 -0700 |
| commit | 4eddb2c221d086d7181ef7ff78bb0e6ce6f3359a (patch) | |
| tree | d1b3c7ebc6b5149a4111176c53ce112a7585ae21 /sql/spatial.h | |
| parent | b59738a598569ace75be5e63b7ed6ca69afe6ebc (diff) | |
| parent | 25c152018dceae35bf0d45de46a33a214048128c (diff) | |
| download | mariadb-git-4eddb2c221d086d7181ef7ff78bb0e6ce6f3359a.tar.gz | |
Merge 5.3->5.5.
In particular:
Merged the patch for bug mdev-4418 from 5.3 into 5.5.
Fixed a bug in the patch that should be backported to 5.3.
Diffstat (limited to 'sql/spatial.h')
| -rw-r--r-- | sql/spatial.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/sql/spatial.h b/sql/spatial.h index 6df6e37e9b8..ee2d6d5ec8d 100644 --- a/sql/spatial.h +++ b/sql/spatial.h @@ -214,11 +214,6 @@ struct Geometry_buffer; class Geometry { public: - // Maximum number of points in feature that can fit into String - static const uint32 max_n_points= - (uint32) (INT_MAX32 - WKB_HEADER_SIZE - 4 /* n_points */) / - POINT_DATA_SIZE; - Geometry() {} /* Remove gcc warning */ virtual ~Geometry() {} /* Remove gcc warning */ static void *operator new(size_t size, void *buffer) |