diff options
| author | Monty <monty@mariadb.org> | 2015-08-18 11:27:00 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2015-08-18 11:27:00 +0300 |
| commit | 4374da63f03abc472f68f42e4e93261a18bfe417 (patch) | |
| tree | 4e6ee59be4da4839e8915532b26c0144138e156a /sql/item_geofunc.cc | |
| parent | 5fe8b747e9e3440f2f746accca0eb11e287a6713 (diff) | |
| parent | dfac82e44dd665ab218348765df2b519db4c10dc (diff) | |
| download | mariadb-git-4374da63f03abc472f68f42e4e93261a18bfe417.tar.gz | |
Merge /my/maria-10.1-default into 10.1
Diffstat (limited to 'sql/item_geofunc.cc')
| -rw-r--r-- | sql/item_geofunc.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/item_geofunc.cc b/sql/item_geofunc.cc index a048462c7aa..065ba6d30b4 100644 --- a/sql/item_geofunc.cc +++ b/sql/item_geofunc.cc @@ -1155,6 +1155,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)) @@ -2398,7 +2400,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 || |