diff options
| author | Georgi Kodinov <joro@sun.com> | 2009-10-24 09:57:31 +0300 |
|---|---|---|
| committer | Georgi Kodinov <joro@sun.com> | 2009-10-24 09:57:31 +0300 |
| commit | 9a5a77eb68a35b3e806bb65f94ec9cd9ab9b1b5e (patch) | |
| tree | a351f8da600536a5ddbd59b8f1fc97281141e181 /sql/item_geofunc.cc | |
| parent | 1339fb17fef8d365bf0eba95ec73d00a21d8879a (diff) | |
| parent | 19ffe2308542735bc37e070bbdf266281ea8156a (diff) | |
| download | mariadb-git-9a5a77eb68a35b3e806bb65f94ec9cd9ab9b1b5e.tar.gz | |
automerge
Diffstat (limited to 'sql/item_geofunc.cc')
| -rw-r--r-- | sql/item_geofunc.cc | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/sql/item_geofunc.cc b/sql/item_geofunc.cc index a34204b7181..3c5990eb359 100644 --- a/sql/item_geofunc.cc +++ b/sql/item_geofunc.cc @@ -84,7 +84,9 @@ String *Item_func_geometry_from_wkb::val_str(String *str) if (args[0]->field_type() == MYSQL_TYPE_GEOMETRY) { - return args[0]->val_str(str); + String *str_ret= args[0]->val_str(str); + null_value= args[0]->null_value; + return str_ret; } wkb= args[0]->val_str(&arg_val); @@ -94,7 +96,10 @@ String *Item_func_geometry_from_wkb::val_str(String *str) str->set_charset(&my_charset_bin); if (str->reserve(SRID_SIZE, 512)) - return 0; + { + null_value= TRUE; /* purecov: inspected */ + return 0; /* purecov: inspected */ + } str->length(0); str->q_append(srid); if ((null_value= |