1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

select send_error cleanup (not everything is fixed)

Browse Source
This commit is contained in:
unknown 2004-09-13 11:22:01 +02:00
parent 356840594d
commit b9c0f6b77e
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sql/sql_select.cc
View File

@ -195,9 +195,7 @@ int handle_select(THD *thd, LEX *lex, select_result *result)
/* Don't set res if it's -1 as we may want this later */
DBUG_PRINT("info",("res: %d report_error: %d", res,
thd->net.report_error));
if (thd->net.report_error)
res= 1;
if (res)
if (thd->net.report_error || res<0)
{
result->send_error(0, NullS);
result->abort();
@ -1462,7 +1460,7 @@ JOIN::exec()
}
curr_join->having= curr_join->tmp_having;
thd->proc_info="Sending data";
error= thd->net.report_error ||
error= thd->net.report_error ? -1 :
do_select(curr_join, curr_fields_list, NULL, procedure);
thd->limit_found_rows= curr_join->send_records;
thd->examined_row_count= curr_join->examined_rows;
@ -5684,7 +5682,7 @@ do_select(JOIN *join,List<Item> *fields,TABLE *table,Procedure *procedure)
DBUG_PRINT("error",("Error: do_select() failed"));
}
#endif
DBUG_RETURN(error || join->thd->net.report_error);
DBUG_RETURN(join->thd->net.report_error ? -1 : error)
}