summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorAlexey Botchkov <holyfoot@askmonty.org>2021-01-19 15:29:03 +0400
committerAlexey Botchkov <holyfoot@askmonty.org>2021-01-19 15:29:03 +0400
commit959dfac4d0e715725d05448a77c08d870d5aa247 (patch)
tree4161965ce412540c5e91e927d4ae32d497ffda8c /sql
parent775aa6f08a33042c11039450006cd5a65554aa80 (diff)
downloadmariadb-git-959dfac4d0e715725d05448a77c08d870d5aa247.tar.gz
MDEV-19723 Assertion `je->state == JST_KEY' failed while SELECT ST_GEOMFROMGEOJSON() and Assertion `!mysql_bin_log.is_open() || thd.is_current_stmt_binlog_format_row()'
The invalid GeoJSON case wasn't handled here.
Diffstat (limited to 'sql')
-rw-r--r--sql/spatial.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/spatial.cc b/sql/spatial.cc
index 83905fc9f3d..840f8bd809c 100644
--- a/sql/spatial.cc
+++ b/sql/spatial.cc
@@ -605,6 +605,7 @@ Geometry *Geometry::create_from_json(Geometry_buffer *buffer,
if (feature_type_found)
goto handle_geometry_key;
}
+ goto err_return;
}
else
{