From 508d40fbdbe02c390f102d991ce0675f519784dd Mon Sep 17 00:00:00 2001 From: Alexey Botchkov <holyfoot@askmonty.org> Date: Thu, 10 Oct 2013 14:20:35 +0500 Subject: [PATCH] MDEV-4788 check mysql-5.5 changes in spatial.cc. Additional patch for the 5.5. --- sql/spatial.cc | 4 ++-- 1 file 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();