diff options
| author | Ramil Kalimullin <ramil@mysql.com> | 2010-09-09 16:43:45 +0400 |
|---|---|---|
| committer | Ramil Kalimullin <ramil@mysql.com> | 2010-09-09 16:43:45 +0400 |
| commit | 5eb7154faabf73e2d5a7b7b767c47e7f66f52e75 (patch) | |
| tree | 2c340194f655e0ceca6b204f3896754ed2f5efef /sql/item_geofunc.h | |
| parent | ccc7ae0e17bdb074a9a124ea08609fb88f5879ad (diff) | |
| parent | 9080f681b4b543797e9f592aefc09977b9770b75 (diff) | |
| download | mariadb-git-5eb7154faabf73e2d5a7b7b767c47e7f66f52e75.tar.gz | |
Automerge.
Diffstat (limited to 'sql/item_geofunc.h')
| -rw-r--r-- | sql/item_geofunc.h | 10 |
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()); } } } |