Skip to content

Commit

Permalink
Post push fix for Bug#25062396.
Browse files Browse the repository at this point in the history
Change: Variable initialization.

Change-Id: I2e4afddcfb9651c98a554695b1565fdb1504b69a
  • Loading branch information
Ajo Robert committed Oct 27, 2017
1 parent b1a1d0d commit 180adbe
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 2 deletions.
3 changes: 2 additions & 1 deletion sql/gcalc_slicescan.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. reserved.
/* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved. reserved.
reserved.
This program is free software; you can redistribute it and/or modify
Expand Down Expand Up @@ -134,6 +134,7 @@ class Gcalc_heap : public Gcalc_dyn_list
#ifndef DBUG_OFF
inline void dbug_print() const;
#endif
Info(): x(0), y(0) {}
};

Gcalc_heap(size_t blk_size=8192) :
Expand Down
1 change: 1 addition & 0 deletions sql/gcalc_tools.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1183,6 +1183,7 @@ int Gcalc_operation_reducer::get_polygon_result(res_point *cur,
if(glue->up)
glue->up->down= NULL;
free_result(glue);
cur->glue= NULL;
}
DBUG_RETURN(get_result_thread(cur, storage, 1) ||
storage->complete_shape());
Expand Down
5 changes: 4 additions & 1 deletion sql/gcalc_tools.h
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,8 @@ class Gcalc_result_receiver
#endif
};

Gcalc_result_receiver() : collection_result(FALSE), n_shapes(0), n_holes(0)
Gcalc_result_receiver() : n_points(0), collection_result(FALSE), n_shapes(0),
n_holes(0), prev_x(0), prev_y(0), shape_area(0)
{}
int start_shape(Gcalc_function::shape_type shape);
int add_point(double x, double y);
Expand Down Expand Up @@ -362,6 +363,8 @@ class Gcalc_operation_reducer : public Gcalc_dyn_list
m_res_hook= &result->next;
result->pi= pi;
result->intersection_point= intersection_point;
result->x= 0;
result->y= 0;
return result;
}

Expand Down

0 comments on commit 180adbe

Please sign in to comment.