Bug#22306745 ST_BUFFER DOES NOT WORK FOR NON CARTESIAN COORDINATES IN

MYSQL V5.7

Problem: ST_Buffer returns an error message when passed a geometry
with SRID different from 0.

Fix: Allow geometries with SRID != 0. All calculations will still be
Cartesian since the server doesn't support non-Cartesian spatial
reference systems.

Author: nryeng

mysql-test/r/gis.result

@@ -1519,7 +1519,8 @@ MULTIPOLYGON(((52 18,48 6,73 9,66 23,52 18),(59 18,67 18,67 13,59 13,59 18)),((6
 SELECT count(*) 
 FROM buildings, bridges 
 WHERE ST_Contains(ST_Buffer(bridges.position, 15.0), buildings.footprint) = 1;
-ERROR HY000: Incorrect arguments to st_buffer
+count(*)
+1
 DROP DATABASE gis_ogs;
 #
 # Bug#13362660 ASSERTION `FIELD_POS < FIELD_COUNT' FAILED. IN PROTOCOL_TEXT::STORE

mysql-test/suite/innodb_gis/r/1.result

@@ -1510,7 +1510,8 @@ MULTIPOLYGON(((52 18,48 6,73 9,66 23,52 18),(59 18,67 18,67 13,59 13,59 18)),((6
 SELECT count(*) 
 FROM buildings, bridges 
 WHERE ST_Contains(ST_Buffer(bridges.position, 15.0), buildings.footprint) = 1;
-ERROR HY000: Incorrect arguments to st_buffer
+count(*)
+1
 DROP DATABASE gis_ogs;
 #
 # Bug#13362660 ASSERTION `FIELD_POS < FIELD_COUNT' FAILED. IN PROTOCOL_TEXT::STORE

mysql-test/suite/innodb_gis/r/gis.result

@@ -1504,7 +1504,8 @@ MULTIPOLYGON(((52 18,48 6,73 9,66 23,52 18),(59 18,67 18,67 13,59 13,59 18)),((6
 SELECT count(*)
 FROM buildings, bridges
 WHERE ST_Contains(ST_Buffer(bridges.position, 15.0), buildings.footprint) = 1;
-ERROR HY000: Incorrect arguments to st_buffer
+count(*)
+1
 DROP DATABASE gis_ogs;
 #
 # Bug#13362660 ASSERTION `FIELD_POS < FIELD_COUNT' FAILED. IN PROTOCOL_TEXT::STORE

mysql-test/suite/innodb_gis/t/1.test

@@ -1428,7 +1428,6 @@ WHERE lakes.name = 'Blue Lake'
 AND named_places.name = 'Ashton'; 
 
 --echo # Conformance Item T51 
---error ER_WRONG_ARGUMENTS
 SELECT count(*) 
 FROM buildings, bridges 
 WHERE ST_Contains(ST_Buffer(bridges.position, 15.0), buildings.footprint) = 1; 

mysql-test/suite/innodb_gis/t/gis.test

@@ -1414,7 +1414,6 @@ WHERE lakes.name = 'Blue Lake'
 AND named_places.name = 'Ashton';
 
 --echo # Conformance Item T51
---error ER_WRONG_ARGUMENTS
 SELECT count(*)
 FROM buildings, bridges
 WHERE ST_Contains(ST_Buffer(bridges.position, 15.0), buildings.footprint) = 1;

mysql-test/t/gis.test

@@ -1440,7 +1440,6 @@ WHERE lakes.name = 'Blue Lake'
 AND named_places.name = 'Ashton'; 
 
 --echo # Conformance Item T51 
---error ER_WRONG_ARGUMENTS
 SELECT count(*) 
 FROM buildings, bridges 
 WHERE ST_Contains(ST_Buffer(bridges.position, 15.0), buildings.footprint) = 1; 

sql/item_geofunc_buffer.cc

@@ -1,4 +1,4 @@
-/* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -422,12 +422,6 @@ String *Item_func_buffer::val_str(String *str_value_arg)
     }
   }
 
-  if (geom->get_srid() != 0)
-  {
-    my_error(ER_WRONG_ARGUMENTS, MYF(0), func_name());
-    DBUG_RETURN(error_str());
-  }
-
   /*
     If distance passed to ST_Buffer is too small, then we return the
     original geometry as its buffer. This is needed to avoid division