diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-04-25 09:04:09 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-04-25 09:04:09 +0300 |
| commit | bc145193c164b895a52b943e73fff53952d48a60 (patch) | |
| tree | 278a02f85834d7ed8fa6933959e9b3b96655d1e1 /sql/gcalc_slicescan.cc | |
| parent | 1f1a61cfc41a01ffa65d568eebdc037a54b5c463 (diff) | |
| parent | bfb0726fc24acb896e54bc7ef7536ad1aab9d574 (diff) | |
| download | mariadb-git-bc145193c164b895a52b943e73fff53952d48a60.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'sql/gcalc_slicescan.cc')
| -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 68764205302..ba75a1ed827 100644 --- a/sql/gcalc_slicescan.cc +++ b/sql/gcalc_slicescan.cc @@ -993,6 +993,8 @@ void Gcalc_heap::reset() { if (m_n_points) { + if (m_hook) + *m_hook= NULL; free_list(m_first); m_n_points= 0; } |