bzr push into mysql-trunk branch (tor.didriksen:3765 to 3766)

[Tor Didriksen]

 3766 Tor Didriksen	2012-03-14
      Fix misc. warnings for -O and maintainer mode.

    modified:
      sql/handler.cc
      sql/item_geofunc.cc
      sql/sql_yacc.yy
 3765 sayantan.dutta@stripped	2012-03-14 [merge]
      BUG #13619394 - 62572: "MAKE TEST" FAILS ON "MY_VSNPRINTF"

    modified:
      unittest/mysys/my_vsnprintf-t.c
=== modified file 'sql/handler.cc'
--- a/sql/handler.cc	2012-03-08 09:44:21 +0000
+++ b/sql/handler.cc	2012-03-14 10:34:57 +0000
@@ -5099,7 +5099,7 @@ static int rowid_cmp(void *h, uchar *a, 
 int DsMrr_impl::dsmrr_fill_buffer()
 {
   char *range_info;
-  int res;
+  int res= 0;
   DBUG_ENTER("DsMrr_impl::dsmrr_fill_buffer");
 
   rowids_buf_cur= rowids_buf;

=== modified file 'sql/item_geofunc.cc'
--- a/sql/item_geofunc.cc	2011-12-09 21:08:37 +0000
+++ b/sql/item_geofunc.cc	2012-03-14 10:34:57 +0000
@@ -781,7 +781,7 @@ mem_error:
 int Item_func_spatial_rel::func_touches()
 {
   double x1, x2, y1, y2, ex, ey;
-  double distance, area;
+  double distance= GIS_ZERO;
   int result= 0;
   int cur_func= 0;
 
@@ -852,7 +852,7 @@ int Item_func_spatial_rel::func_touches(
       }
       if (cur_func)
       {
-        area= scan_it.get_h() *
+        double area= scan_it.get_h() *
               ((ti.rb()->x - ti.lb()->x) + (ti.rt()->x - ti.lt()->x));
         if (area > GIS_ZERO)
         {

=== modified file 'sql/sql_yacc.yy'
--- a/sql/sql_yacc.yy	2012-03-13 14:47:12 +0000
+++ b/sql/sql_yacc.yy	2012-03-14 10:34:57 +0000
@@ -10972,7 +10972,9 @@ select_var_ident:  
         | ident_or_text
           {
             LEX *lex= Lex;
+#ifndef DBUG_OFF
             sp_head *sp= lex->sphead;
+#endif
             sp_pcontext *pctx= lex->get_sp_current_parsing_ctx();
             sp_variable *spv;
 

No bundle (reason: useless for push emails).