mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 13:02:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed memory leak (now JOIN cleaning procedure always called)

Browse source
This commit is contained in:
bell@sanja.is.com.ua 2003-09-13 02:07:06 +03:00
parent efce59fc3f
commit 462dba1b5b
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
sql/sql_select.cc
View file

@ -1514,7 +1514,7 @@ mysql_select(THD *thd, Item ***rref_pointer_array,
conds, og_num, order, group, having, proc_param,
select_lex, unit, tables_and_fields_initied))
{
DBUG_RETURN(-1);
goto err;
}
}
join->select_options= select_options;
@ -1529,15 +1529,12 @@ mysql_select(THD *thd, Item ***rref_pointer_array,
conds, og_num, order, group, having, proc_param,
select_lex, unit, tables_and_fields_initied))
{
DBUG_RETURN(-1);
goto err;
}
}
if ((err= join->optimize()))
{
if (err == -1)
DBUG_RETURN(join->error);
DBUG_ASSERT(err == 1);
goto err; // 1
}