fixes to make compilers happy.

per-file comments:
  mysql-test/t/gis-precise.test
        number-to-string conversion differs on Windows.
        Have to tolerate this while GIS data is stored in doubles.
  sql/spatial.cc
        prev_x initialization added.

2 files changed, 5 insertions, 1 deletions

diff --git a/mysql-test/t/gis-precise.test b/mysql-test/t/gis-precise.test
index 1de8726a7bc..b48da25c3c9 100644
--- a/mysql-test/t/gis-precise.test
+++ b/mysql-test/t/gis-precise.test
@@ -78,6 +78,7 @@ select astext(ST_symdifference(geomfromtext('polygon((0 0, 1 0, 0 1, 0 0))'), ge
 select astext(ST_UNION(GeomFromText('POLYGON((0 0, 50 45, 40 50, 0 0))'), GeomFromText('LINESTRING(-10 -10, 200 200, 199 201, -11 -9)')));
 
 # Buffer() tests
+--replace_result 0012045437948276 00120454379482759
 select astext(ST_buffer(geometryfromtext('point(1 1)'), 1));
 create table t1(geom geometrycollection);
 insert into t1 values (geomfromtext('POLYGON((0 0, 10 10, 0 8, 0 0))'));
@@ -87,6 +88,7 @@ select astext(ST_buffer(geom,2)) from t1;
 
 set @geom=geomfromtext('LINESTRING(2 1, 4 2, 2 3, 2 5)');
 set @buff=ST_buffer(@geom,1);
+--replace_result 40278744502097 40278744502096
 select astext(@buff);
 
 # cleanup
@@ -133,6 +135,7 @@ SELECT ASTEXT(ST_INTERSECTION(
 
 #bug 804324 Assertion 0 in Gcalc_scan_iterator::pop_suitable_intersection
 
+--replace_result 61538461538462 61538461538461
 SELECT ASTEXT(ST_UNION(
         MULTILINESTRINGFROMTEXT('MULTILINESTRING((6 2,4 0,3 5,3 6,4 3,6 4,3 9,0 7,3 7,8 4,2 9,5 0),
                                                  (8 2,1 3,9 0,4 4))'),
diff --git a/sql/spatial.cc b/sql/spatial.cc
index b4ce6f59185..89ecec51406 100644
--- a/sql/spatial.cc
+++ b/sql/spatial.cc
@@ -766,7 +766,8 @@ int Gis_line_string::store_shapes(Gcalc_shape_transporter *trn) const
 {
   uint32 n_points;
   double x, y;
-  double prev_x, prev_y;
+  double prev_x= 0.0;
+  double prev_y= 0.0;
   int first_point= 1;
   const char *data= m_data;