summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
Diffstat (limited to 'sql')
-rw-r--r--sql/item_geofunc.h10
1 files changed, 6 insertions, 4 deletions
diff --git a/sql/item_geofunc.h b/sql/item_geofunc.h
index 9360013fa80..84034841ad5 100644
--- a/sql/item_geofunc.h
+++ b/sql/item_geofunc.h
@@ -181,13 +181,15 @@ public:
String *val_str(String *);
void fix_length_and_dec()
{
- for( unsigned int i=0; i<arg_count; ++i)
+ for (unsigned int i= 0; i < arg_count; ++i)
{
- if( args[i]->fixed && args[i]->field_type() != MYSQL_TYPE_GEOMETRY)
+ if (args[i]->fixed && args[i]->field_type() != MYSQL_TYPE_GEOMETRY)
{
String str;
- args[i]->val_str(&str);
- my_error(ER_ILLEGAL_VALUE_FOR_TYPE,MYF(0),"non geometric",str.c_ptr());
+ args[i]->print(&str, QT_ORDINARY);
+ str.append('\0');
+ my_error(ER_ILLEGAL_VALUE_FOR_TYPE, MYF(0), "non geometric",
+ str.ptr());
}
}
}