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

sql_select.cc, opt_sum.cc:

Browse Source 
Fix bug: if MIN() or MAX() resulted in a deadlock or a lock wait timeout, MySQL did not return an error, but NULL as the function value


sql/opt_sum.cc:
  Fix bug: if MIN() or MAX() resulted in a deadlock or a lock wait timeout, MySQL did not return an error, but NULL as the function value
sql/sql_select.cc:
  Fix bug: if MIN() or MAX() resulted in a deadlock or a lock wait timeout, MySQL did not return an error, but NULL as the function value
This commit is contained in:
unknown
2003-05-07 19:01:45 +03:00
parent 03706ea4b6
commit 0299df4b4f
2 changed files with 46 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sql/sql_select.cc
View File

@ -391,8 +391,17 @@ mysql_select(THD *thd,TABLE_LIST *tables,List<Item> &fields,COND *conds,
if (tables && join.tmp_table_param.sum_func_count && ! group)
{
int res;
/*
opt_sum_query returns -1 if no rows match to the WHERE conditions,
or 1 if all items were resolved, or 0, or an error number HA_ERR_...
*/
if ((res=opt_sum_query(tables, all_fields, conds)))
{
if (res > 1)
{
delete procedure;
DBUG_RETURN(-1);
}
if (res < 0)
{
error=return_zero_rows(&join, result, tables, fields, !group,