diff options
| author | Alexey Botchkov <holyfoot@askmonty.org> | 2013-10-10 14:20:35 +0500 |
|---|---|---|
| committer | Alexey Botchkov <holyfoot@askmonty.org> | 2013-10-10 14:20:35 +0500 |
| commit | 508d40fbdbe02c390f102d991ce0675f519784dd (patch) | |
| tree | 378cebd5d35ff49e42b0047a3099c8eb3f5820e4 /sql/spatial.cc | |
| parent | ae826010351ab69a056034769124f3dac67a3de7 (diff) | |
| download | mariadb-git-508d40fbdbe02c390f102d991ce0675f519784dd.tar.gz | |
MDEV-4788 check mysql-5.5 changes in spatial.cc.
Additional patch for the 5.5.
Diffstat (limited to 'sql/spatial.cc')
| -rw-r--r-- | sql/spatial.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/spatial.cc b/sql/spatial.cc index 1d4051487ae..b82e6977f8a 100644 --- a/sql/spatial.cc +++ b/sql/spatial.cc @@ -793,7 +793,7 @@ int Gis_line_string::store_shapes(Gcalc_shape_transporter *trn) const return 1; n_points= uint4korr(data); data+= 4; - if (n_points < 1 || no_data(data, POINT_DATA_SIZE * n_points)) + if (n_points < 1 || not_enough_points(data, n_points)) return 1; trn->start_line(); @@ -1230,7 +1230,7 @@ int Gis_polygon::store_shapes(Gcalc_shape_transporter *trn) const return 1; n_points= uint4korr(data); data+= 4; - if (!n_points || no_data(data, POINT_DATA_SIZE * n_points)) + if (!n_points || not_enough_points(data, n_points)) return 1; trn->start_ring(); |