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

Merge branch '10.5' into 10.6

Browse Source
This commit is contained in:
Yuchen Pei
2024-12-17 11:06:09 +11:00
parent c982a143fc 77c9917663
commit 671f80c738
48 changed files with 735 additions and 486 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_union.cc
View File

@@ -1026,7 +1026,8 @@ bool select_union_direct::send_eof()
// Reset for each SELECT_LEX, so accumulate here
limit_found_rows+= thd->limit_found_rows;
if (unit->thd->lex->current_select == last_select_lex)
if (unit->thd->lex->current_select == last_select_lex ||
thd->killed == ABORT_QUERY)
{
thd->limit_found_rows= limit_found_rows;