database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

removed double procedure deletetion

Browse Source
This commit is contained in:
unknown
2003-09-13 10:30:41 +03:00
parent 5b0c15a42b
commit 434faadcdb
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sql/sql_select.cc
View File

@ -478,8 +478,7 @@ bool JOIN::test_in_subselect(Item **where)
/* /*
global select optimisation. global select optimisation.
return 0 - success return 0 - success
1 - go out 1 - error
-1 - go out with cleaning
error code saved in field 'error' error code saved in field 'error'
*/ */
int int
@ -516,11 +515,9 @@ JOIN::optimize()
conds= optimize_cond(conds,&cond_value); conds= optimize_cond(conds,&cond_value);
if (thd->net.report_error) if (thd->net.report_error)
{ {
// quick abort error= 1;
delete procedure;
error= thd->is_fatal_error ? -1 : 1;
DBUG_PRINT("error",("Error from optimize_cond")); DBUG_PRINT("error",("Error from optimize_cond"));
DBUG_RETURN(error); DBUG_RETURN(1);
} }
if (cond_value == Item::COND_FALSE || if (cond_value == Item::COND_FALSE ||
@ -543,8 +540,7 @@ JOIN::optimize()
{ {
if (res > 1) if (res > 1)
{ {
delete procedure; DBUG_RETURN(1);
DBUG_RETURN(-1);
} }
if (res < 0) if (res < 0)
{ {