diff options
author | Oleksandr Byelkin <sanja@mariadb.com> | 2021-02-02 17:55:53 +0100 |
---|---|---|
committer | Oleksandr Byelkin <sanja@mariadb.com> | 2021-02-02 17:55:53 +0100 |
commit | 0f810b58faf487c7cd59f2ee520f62deb0f712eb (patch) | |
tree | dfb52d41ffd83d0dbffb969c091fe190b9457a24 /sql/spatial.cc | |
parent | 542d769ea1a22a7a6a87c9fe76ff911a162ade44 (diff) | |
parent | 251b52190070095e4c65ffb0ae545d49330a02b2 (diff) | |
download | mariadb-git-10.4-merge-attempt.tar.gz |
Merge branch 'bb-10.3-release' into bb-10.4-release10.4-merge-attempt
Diffstat (limited to 'sql/spatial.cc')
-rw-r--r-- | sql/spatial.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/spatial.cc b/sql/spatial.cc index 2b36468e158..84a05532532 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 { |