diff options
| author | Monty <monty@mariadb.org> | 2015-08-18 11:17:54 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2015-08-18 11:18:58 +0300 |
| commit | dfac82e44dd665ab218348765df2b519db4c10dc (patch) | |
| tree | 99a1b08c2c1405a9f2c3a927b721033e9651de69 /sql/item_geofunc.cc | |
| parent | 6b20342651bb5207b6c125d2d11b664a1bebcc41 (diff) | |
| download | mariadb-git-dfac82e44dd665ab218348765df2b519db4c10dc.tar.gz | |
Fixed failing tests and compiler warnings
- UNINIT_VAR() was required for 4.8.3 on openSUSE 13.2
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 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 || |