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

fixed bug of derived table in subselect

Browse Source 
fixed bug in error handling
This commit is contained in:
bell@sanja.is.com.ua
2002-11-13 11:59:03 +02:00
parent e3d78f0bd4
commit d8f1d74fe5
6 changed files with 36 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/sql_select.cc
View File

@ -994,7 +994,8 @@ JOIN::exec()
}
having=having_list; // Actually a parameter
thd->proc_info="Sending data";
error=do_select(this, &fields_list, NULL, procedure);
error= thd->net.report_error ||
do_select(this, &fields_list, NULL, procedure);
DBUG_VOID_RETURN;
}
@ -1078,7 +1079,7 @@ mysql_select(THD *thd, TABLE_LIST *tables, List<Item> &fields, COND *conds,
goto err;
}
if (free_join && join->global_optimize())
if (thd->net.report_error || (free_join && join->global_optimize()))
goto err;
join->exec();