summaryrefslogtreecommitdiff
path: root/sql/field.h
diff options
context:
space:
mode:
Diffstat (limited to 'sql/field.h')
-rw-r--r--sql/field.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/field.h b/sql/field.h
index a52bd01395a..97a820e9470 100644
--- a/sql/field.h
+++ b/sql/field.h
@@ -2591,6 +2591,7 @@ public:
int reset(void) { return Field_blob::reset() || !maybe_null(); }
geometry_type get_geometry_type() { return geom_type; };
+ static geometry_type geometry_type_merge(geometry_type, geometry_type);
};
#endif /*HAVE_SPATIAL*/