bzr commit into mysql-5.1 branch (holyfoot:2661)

[Alexey Botchkov]

#At file:///home/hf/work/mysql_common/mysql-5.1-wl1326/ based on revid:holyfoot@stripped

 2661 Alexey Botchkov	2009-05-13
      code trimmed to keep compilers happy.

    modified:
      sql/gcalc_slicescan.h
      sql/gcalc_tools.cc
      sql/spatial.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/[e-mail]