List:Commits« Previous MessageNext Message »
From:Alexey Botchkov Date:May 13 2009 7:06am
Subject:bzr push into mysql-5.1 branch (holyfoot:2660 to 2661)
View as plain text  
 2661 Alexey Botchkov	2009-05-13
      code trimmed to keep compilers happy.

    modified:
      sql/gcalc_slicescan.h
      sql/gcalc_tools.cc
      sql/spatial.cc
 2660 Alexey Botchkov	2009-05-12
      Bug#44753      nan error in union function
           The 'slicescan' algorithm fails if it meets a sequence of
           points in a polygon with exactly same coordinates.
           Fixed by separately checking if (y1 - y0 == 0.0)
      
           Makefiles also fixed to make the windows build possible.
      
      per-file comments:
        libmysqld/CMakeLists.txt
           sql/stacktrace.cc removed
      
        sql/CMakeLists.txt
           sql/gcalc_slicescan.cc and sql/gcalc_tools.cc added to the package
      
        sql/gcalc_slicescan.cc
      Bug#44753      nan error in union function
           GET_DX_DY function fixed to handle (0,0) case properly

    modified:
      libmysqld/CMakeLists.txt
      sql/CMakeLists.txt
      sql/gcalc_slicescan.cc
=== modified file 'sql/gcalc_slicescan.h'
--- a/sql/gcalc_slicescan.h	2007-11-22 16:17:17 +0000
+++ b/sql/gcalc_slicescan.h	2009-05-13 07:03:17 +0000
@@ -135,14 +135,14 @@ public:
   void start_line(gcalc_shape_info info)
   {
     m_shape_info= info;
-    m_first= NULL;
+    m_first= m_prev= NULL;
     m_line_flag= TRUE;
   }
 
   void start_ring(gcalc_shape_info info)
   {
     m_shape_info= info;
-    m_first= NULL;
+    m_first= m_prev= NULL;
     m_line_flag= FALSE;
   }
 

=== modified file 'sql/gcalc_tools.cc'
--- a/sql/gcalc_tools.cc	2009-04-13 08:03:25 +0000
+++ b/sql/gcalc_tools.cc	2009-05-13 07:03:17 +0000
@@ -240,6 +240,7 @@ int gcalc_result_receiver::get_result_ty
     default:
       DBUG_ASSERT(0);
   }
+  return 0;
 }
 
 

=== modified file 'sql/spatial.cc'
--- a/sql/spatial.cc	2009-05-12 14:02:28 +0000
+++ b/sql/spatial.cc	2009-05-13 07:03:17 +0000
@@ -2094,7 +2094,7 @@ uint Gis_geometry_collection::init_from_
       case gcalc_function::shape_point:   wkb_type= wkb_point; break;
       case gcalc_function::shape_line:    wkb_type= wkb_linestring; break;
       case gcalc_function::shape_polygon: wkb_type= wkb_polygon; break;
-      default: DBUG_ASSERT(FALSE);
+      default: wkb_type= 0; DBUG_ASSERT(FALSE);
     };
 
     if (bin->reserve(WKB_HEADER_SIZE, 512))


Attachment: [text/bzr-bundle] bzr/holyfoot@mysql.com-20090513070317-64a1gjuwbi4p3nyt.bundle
Thread
bzr push into mysql-5.1 branch (holyfoot:2660 to 2661)Alexey Botchkov13 May