Merge branch '10.9' into 10.10mariadb-10.10.2

1 files changed, 2 insertions, 0 deletions

diff --git a/sql/spatial.h b/sql/spatial.h
index 7b33529ee94..8974511adf9 100644
--- a/sql/spatial.h
+++ b/sql/spatial.h
@@ -353,6 +353,7 @@ protected:
   const char *get_mbr_for_points(MBR *mbr, const char *data, uint offset)
     const;
 
+public:
   /**
      Check if there're enough data remaining as requested
 
@@ -383,6 +384,7 @@ protected:
             (expected_points > ((m_data_end - data) /
                                 (POINT_DATA_SIZE + extra_point_space))));
   }
+protected:
   const char *m_data;
   const char *m_data_end;
 };