diff options
| author | Sergey Petrunia <sergefp@mysql.com> | 2008-12-23 16:28:13 +0300 |
|---|---|---|
| committer | Sergey Petrunia <sergefp@mysql.com> | 2008-12-23 16:28:13 +0300 |
| commit | cb6a7559292703bfc40fd82851c330481f0289a4 (patch) | |
| tree | 6ccefc00f1440f8f5e9881daf7b284cc1fc96496 /sql/opt_range.cc | |
| parent | e6390e23c23d95adc1c11c8eb5de452b58491141 (diff) | |
| parent | 7658444b9716497fcbad8de74478f52ba3f37ca9 (diff) | |
| download | mariadb-git-cb6a7559292703bfc40fd82851c330481f0289a4.tar.gz | |
Merge: mysql-5.0-bugteam -> mysql-5.1-bugteam
Diffstat (limited to 'sql/opt_range.cc')
| -rw-r--r-- | sql/opt_range.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/opt_range.cc b/sql/opt_range.cc index 7d9709909c3..5921199f73f 100644 --- a/sql/opt_range.cc +++ b/sql/opt_range.cc @@ -1245,6 +1245,9 @@ QUICK_INDEX_MERGE_SELECT::~QUICK_INDEX_MERGE_SELECT() quick->file= NULL; quick_selects.delete_elements(); delete pk_quick_select; + /* It's ok to call the next two even if they are already deinitialized */ + end_read_record(&read_record); + free_io_cache(head); free_root(&alloc,MYF(0)); DBUG_VOID_RETURN; } |