diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-07-01 18:15:00 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-07-01 18:15:00 +0000 |
| commit | a2a2e32c02643a0cec111511220227703fda1cd5 (patch) | |
| tree | 69cc2b631234c2a8e026b9cd4d72676c61c594df /sql/sql_insert.cc | |
| parent | Releasing progress-linux version 1:10.11.8-1~progress7.99u1. (diff) | |
| download | mariadb-a2a2e32c02643a0cec111511220227703fda1cd5.tar.xz mariadb-a2a2e32c02643a0cec111511220227703fda1cd5.zip | |
Merging upstream version 1:11.4.2.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'sql/sql_insert.cc')
| -rw-r--r-- | sql/sql_insert.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index e16ac1c1..fe461dfd 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -1133,11 +1133,7 @@ bool mysql_insert(THD *thd, TABLE_LIST *table_list, } } - if ((res= table_list->view_check_option(thd, - (values_list.elements == 1 ? - 0 : - ignore))) == - VIEW_CHECK_SKIP) + if ((res= table_list->view_check_option(thd, ignore)) == VIEW_CHECK_SKIP) continue; else if (res == VIEW_CHECK_ERROR) { @@ -1416,6 +1412,7 @@ abort: thd->abort_on_warning= 0; if (readbuff) my_free(readbuff); + status_var_add(thd->status_var.rows_sent, thd->get_sent_row_count()); DBUG_RETURN(retval); } |