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:
Sergei Golubchik
2022-05-10 11:53:59 +02:00
parent f4d671bff2 fe3d07cab8
commit 3bc98a4ec4
249 changed files with 7080 additions and 1864 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_tvc.cc
View File

@@ -438,10 +438,12 @@ bool table_value_constr::exec(SELECT_LEX *sl)
while ((elem= li++))
{
THD *cur_thd= sl->parent_lex->thd;
if (send_records >= sl->master_unit()->lim.get_select_limit())
break;
int rc=
result->send_data_with_check(*elem, sl->master_unit(), send_records);
cur_thd->get_stmt_da()->inc_current_row_for_warning();
if (!rc)
send_records++;
else if (rc > 0)
@@ -1207,4 +1209,3 @@ bool JOIN::transform_in_predicates_into_in_subq(THD *thd)
thd->lex->current_select= save_current_select;
DBUG_RETURN(false);
}