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

Remove has_error as a member from Item_sum and use THD::is_error() instead

Browse Source 
Additionally, allow a query with window functions to be killed by the user during
its execution.
This commit is contained in:
Vicențiu Ciorbaru
2017-08-29 18:27:16 +03:00
committed by Varun Gupta
parent f4ba298abd
commit 24e219b179
4 changed files with 8 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sql/sql_window.cc
View File

@ -1080,8 +1080,6 @@ protected:
while ((item_sum= it++))
{
item_sum->add();
if (item_sum->has_error)
return;
}
}
@ -2807,10 +2805,11 @@ bool compute_window_func(THD *thd,
cursor_manager->notify_cursors_next_row();
}
/* check if we found any error in the window function while calling the add function */
/* Check if we found any error in the window function while adding values
through cursors. */
if (thd->is_error() || thd->is_killed())
break;
if (win_func->window_func()->has_error)
goto label;
/* Return to current row after notifying cursors for each window
function. */
@ -2824,7 +2823,6 @@ bool compute_window_func(THD *thd,
rownum++;
}
label:
my_free(rowid_buf);
partition_trackers.delete_elements();
end_read_record(&info);