diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-06-21 16:19:43 +0300 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-06-21 16:19:43 +0300 |
| commit | 2e335a471ced0d86716f8c657f4d67f510712a30 (patch) | |
| tree | 6fa56f9d9083007e874449b9c2b27579f718ed94 /sql/item_geofunc.cc | |
| parent | 472c2d9b2fbb262665bdd08338ea902e8398010d (diff) | |
| parent | 8baf9b0c469e2845d15cc1181bc6b101cdfba087 (diff) | |
| download | mariadb-git-2e335a471ced0d86716f8c657f4d67f510712a30.tar.gz | |
Merge remote-tracking branch '10.0' into 10.1
Diffstat (limited to 'sql/item_geofunc.cc')
| -rw-r--r-- | sql/item_geofunc.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_geofunc.cc b/sql/item_geofunc.cc index c856aa985b3..fd7241b7bc3 100644 --- a/sql/item_geofunc.cc +++ b/sql/item_geofunc.cc @@ -1859,7 +1859,7 @@ String *Item_func_buffer::val_str(String *str_value) { DBUG_ENTER("Item_func_buffer::val_str"); DBUG_ASSERT(fixed == 1); - String *obj= args[0]->val_str(&tmp_value); + String *obj= args[0]->val_str(str_value); double dist= args[1]->val_real(); Geometry_buffer buffer; Geometry *g; |