diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2022-05-09 22:04:06 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2022-05-09 22:04:06 +0200 |
| commit | ef781162ff2eb97f405b19dc150ab674e91dbc05 (patch) | |
| tree | 63b897dece50ab65652174af4cd0aabd8f3a8505 /sql/sql_tvc.cc | |
| parent | e9af6b2a4d8750c32d4953f08f8bc5f2e33cb9e3 (diff) | |
| parent | 16cebed54065ad9e18953aa86d48f6007d53c2d3 (diff) | |
| download | mariadb-git-ef781162ff2eb97f405b19dc150ab674e91dbc05.tar.gz | |
Merge branch '10.4' into 10.5
Diffstat (limited to 'sql/sql_tvc.cc')
| -rw-r--r-- | sql/sql_tvc.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_tvc.cc b/sql/sql_tvc.cc index a29f6303607..58f6a0afc0a 100644 --- a/sql/sql_tvc.cc +++ b/sql/sql_tvc.cc @@ -437,10 +437,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) @@ -1209,4 +1211,3 @@ bool JOIN::transform_in_predicates_into_in_subq(THD *thd) thd->lex->current_select= save_current_select; DBUG_RETURN(false); } - |