database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Fix the merge error in 2bd4dc38 (Merge branch '10.2' into bb-10.2-mdev9543)

Browse Source
This commit is contained in:
Sergei Petrunia
2016-03-30 16:00:46 +03:00
parent 3450c2da02
commit 9b5951c383
1 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_select.cc
View File

@@ -11421,8 +11421,6 @@ void JOIN_TAB::cleanup()
select= 0; select= 0;
delete quick; delete quick;
quick= 0; quick= 0;
delete filesort;
filesort= 0;
if (cache) if (cache)
{ {
cache->free(); cache->free();