summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorAlexey Botchkov <holyfoot@mysql.com>2011-01-12 17:11:31 +0400
committerAlexey Botchkov <holyfoot@mysql.com>2011-01-12 17:11:31 +0400
commit75c2a822b8d71e827be8e507c27250a08820000c (patch)
treeb3f6f73d2fda09077ee0c3be8e18edb80288c706 /sql
parent7aa999607a5ed0dcf6c93bf511b858afa4563297 (diff)
parent33c78e328f4d8238b7b53c246e28bb44a97ee3c0 (diff)
downloadmariadb-git-75c2a822b8d71e827be8e507c27250a08820000c.tar.gz
merging.
Diffstat (limited to 'sql')
-rw-r--r--sql/item_geofunc.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/item_geofunc.h b/sql/item_geofunc.h
index 84034841ad5..6145f72b665 100644
--- a/sql/item_geofunc.h
+++ b/sql/item_geofunc.h
@@ -181,6 +181,7 @@ public:
String *val_str(String *);
void fix_length_and_dec()
{
+ Item_geometry_func::fix_length_and_dec();
for (unsigned int i= 0; i < arg_count; ++i)
{
if (args[i]->fixed && args[i]->field_type() != MYSQL_TYPE_GEOMETRY)