diff options
| author | Alexey Botchkov <holyfoot@askmonty.org> | 2019-04-22 23:28:44 +0400 |
|---|---|---|
| committer | Alexey Botchkov <holyfoot@askmonty.org> | 2019-04-22 23:28:44 +0400 |
| commit | a4f7d859322ab771289abf13f50752266af43187 (patch) | |
| tree | ca6c122275d10c7346ab0960245ee238d62eb2c0 /sql | |
| parent | 6c5e4c9bc0d9ac30f7ec7ee334630bacb58687ba (diff) | |
| download | mariadb-git-a4f7d859322ab771289abf13f50752266af43187.tar.gz | |
MDEV-18920 Prepared statements with st_convexhull hang and eat 100% cpu.
In the case of error when object shapes are half-collected we need
to set the NULL at the vertice's list.
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/gcalc_slicescan.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/gcalc_slicescan.cc b/sql/gcalc_slicescan.cc index ab48542add6..644ab4b8710 100644 --- a/sql/gcalc_slicescan.cc +++ b/sql/gcalc_slicescan.cc @@ -982,6 +982,8 @@ void Gcalc_heap::reset() { if (m_n_points) { + if (m_hook) + *m_hook= NULL; free_list(m_first); m_n_points= 0; } |