diff options
| author | Alexey Botchkov <holyfoot@askmonty.org> | 2021-03-17 09:03:45 +0400 |
|---|---|---|
| committer | Alexey Botchkov <holyfoot@askmonty.org> | 2021-04-21 10:21:43 +0400 |
| commit | e9fd327ee313088b9a8f497f1c1409990ce6c1cd (patch) | |
| tree | 377a1dc735b35e99d56915d71077730c8cbebfb9 /sql/item_geofunc.cc | |
| parent | a3099a3b4a394da360b5c1e7ae6dc985ae2f7f2f (diff) | |
| download | mariadb-git-e9fd327ee313088b9a8f497f1c1409990ce6c1cd.tar.gz | |
MDEV-17399 Add support for JSON_TABLE.
The specific table handler for the table functions was introduced,
and used to implement JSON_TABLE.
Diffstat (limited to 'sql/item_geofunc.cc')
| -rw-r--r-- | sql/item_geofunc.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sql/item_geofunc.cc b/sql/item_geofunc.cc index 9aec6a0bad5..9c776baa2fd 100644 --- a/sql/item_geofunc.cc +++ b/sql/item_geofunc.cc @@ -115,10 +115,6 @@ String *Item_func_geometry_from_wkb::val_str(String *str) } -void report_json_error_ex(String *js, json_engine_t *je, - const char *fname, int n_param, - Sql_condition::enum_warning_level lv); - String *Item_func_geometry_from_json::val_str(String *str) { DBUG_ASSERT(fixed == 1); @@ -178,7 +174,8 @@ String *Item_func_geometry_from_json::val_str(String *str) my_error(ER_GIS_INVALID_DATA, MYF(0), "ST_GeomFromGeoJSON"); break; default: - report_json_error_ex(js, &je, func_name(), 0, Sql_condition::WARN_LEVEL_WARN); + report_json_error_ex(js->ptr(), &je, func_name(), 0, + Sql_condition::WARN_LEVEL_WARN); return NULL; } |