summaryrefslogtreecommitdiff
path: root/sql/item_geofunc.h
diff options
context:
space:
mode:
authorVicențiu Ciorbaru <vicentiu@mariadb.org>2017-06-21 16:19:43 +0300
committerVicențiu Ciorbaru <vicentiu@mariadb.org>2017-06-21 16:19:43 +0300
commit2e335a471ced0d86716f8c657f4d67f510712a30 (patch)
tree6fa56f9d9083007e874449b9c2b27579f718ed94 /sql/item_geofunc.h
parent472c2d9b2fbb262665bdd08338ea902e8398010d (diff)
parent8baf9b0c469e2845d15cc1181bc6b101cdfba087 (diff)
downloadmariadb-git-2e335a471ced0d86716f8c657f4d67f510712a30.tar.gz
Merge remote-tracking branch '10.0' into 10.1
Diffstat (limited to 'sql/item_geofunc.h')
-rw-r--r--sql/item_geofunc.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/item_geofunc.h b/sql/item_geofunc.h
index 121e122d939..251cae1121e 100644
--- a/sql/item_geofunc.h
+++ b/sql/item_geofunc.h
@@ -239,7 +239,6 @@ public:
class Item_func_spatial_collection: public Item_geometry_func
{
- String tmp_value;
enum Geometry::wkbType coll_type;
enum Geometry::wkbType item_type;
public:
@@ -412,7 +411,6 @@ protected:
Gcalc_result_receiver res_receiver;
Gcalc_operation_reducer operation;
- String tmp_value;
public:
Item_func_buffer(THD *thd, Item *obj, Item *distance):