diff options
| author | Monty <monty@mariadb.org> | 2017-11-02 15:40:27 +0200 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2017-11-02 15:40:27 +0200 |
| commit | 0f4e005541056fed489209f9503cc78e5b16c056 (patch) | |
| tree | 9ad1b0a774f079647ae4c0a2ed74eee2105f6a2a /sql | |
| parent | 6b7918d524d5fc1f63f520cf88784fef13a43c25 (diff) | |
| download | mariadb-git-0f4e005541056fed489209f9503cc78e5b16c056.tar.gz | |
Fixed compiler warning and warning from valgrind
The failing test was main.gis-json
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/item_geofunc.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_geofunc.cc b/sql/item_geofunc.cc index 1fa6b52cf96..6f79bd9a039 100644 --- a/sql/item_geofunc.cc +++ b/sql/item_geofunc.cc @@ -144,7 +144,7 @@ String *Item_func_geometry_from_json::val_str(String *str) { String *sv= args[1]->val_str(&tmp_js); my_error(ER_WRONG_VALUE_FOR_TYPE, MYF(0), - "option", sv->c_ptr(), "ST_GeometryFromJSON"); + "option", sv->c_ptr_safe(), "ST_GeometryFromJSON"); null_value= 1; return 0; } |