diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-04-25 09:05:52 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-04-25 09:05:52 +0300 |
| commit | acf6f92aa936fbfe7524617ae57d011ab8f1f96d (patch) | |
| tree | e7fc2258c06a0fdab1cce115de4d71a091d82d28 /sql/gcalc_slicescan.cc | |
| parent | 765ae6e82165d1bc4cf6cc9f0d556d66a5e172d1 (diff) | |
| parent | bc145193c164b895a52b943e73fff53952d48a60 (diff) | |
| download | mariadb-git-acf6f92aa936fbfe7524617ae57d011ab8f1f96d.tar.gz | |
Merge 10.2 into 10.3
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 9127bb95aeb..3a5dc6410a8 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; } |