Fixed failing tests and compiler warnings

- UNINIT_VAR() was required for 4.8.3 on openSUSE 13.2

3 files changed, 9 insertions, 2 deletions

diff --git a/sql/item_geofunc.cc b/sql/item_geofunc.cc
index 55e69c68adb..f1c9e037aeb 100644
--- a/sql/item_geofunc.cc
+++ b/sql/item_geofunc.cc
@@ -1082,6 +1082,8 @@ static int setup_relate_func(Geometry *g1, Geometry *g2,
   uint shape_a, shape_b;
   uint n_operands= 0;
   int last_shape_pos;
+  UNINIT_VAR(shape_a);
+  UNINIT_VAR(shape_b);
 
   last_shape_pos= func->get_next_expression_pos();
   if (func->reserve_op_buffer(1))
@@ -2325,7 +2327,8 @@ String *Item_func_pointonsurface::val_str(String *str)
   String *result= 0;
   const Gcalc_scan_iterator::point *pprev= NULL;
   uint32 srid;
-
+  UNINIT_VAR(px);
+  UNINIT_VAR(py);
 
   null_value= 1;
   if ((args[0]->null_value ||
diff --git a/sql/opt_range.cc b/sql/opt_range.cc
index 7361c8443c4..c2979f97e80 100644
--- a/sql/opt_range.cc
+++ b/sql/opt_range.cc
@@ -3545,9 +3545,11 @@ bool calculate_cond_selectivity_for_table(THD *thd, TABLE *table, Item **cond)
 	    break; 
           bitmap_set_bit(&handled_columns, key_part->fieldnr-1);
         }
-        double selectivity_mult;
         if (i)
         {
+          double selectivity_mult;
+          UNINIT_VAR(selectivity_mult);
+
           /* 
             There is at least 1-column prefix of columns whose selectivity has
             not yet been accounted for.
diff --git a/sql/sp_head.cc b/sql/sp_head.cc
index 777775e6e39..667cac41d43 100644
--- a/sql/sp_head.cc
+++ b/sql/sp_head.cc
@@ -1133,6 +1133,8 @@ sp_head::execute(THD *thd, bool merge_da_on_success)
   Diagnostics_area *da= thd->get_stmt_da();
   Warning_info sp_wi(da->warning_info_id(), false, true);
 
+  UNINIT_VAR(saved_creation_ctx);
+
   /* this 7*STACK_MIN_SIZE is a complex matter with a long history (see it!) */
   if (check_stack_overrun(thd, 7 * STACK_MIN_SIZE, (uchar*)&old_packet))
     DBUG_RETURN(TRUE);