diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-01-11 10:35:06 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-01-11 10:35:06 +0200 |
| commit | fd5e103aa4b97e080dd497b93992e5f32ef83fdf (patch) | |
| tree | 4688325520abb9c71d1b41c62aa2265d32821db7 /sql/sql_update.cc | |
| parent | a131b976b205af4023a5d43569fadf44dceade70 (diff) | |
| parent | 5a1a7141870459cf66d8e441b443187f87a10d5d (diff) | |
| download | mariadb-git-fd5e103aa4b97e080dd497b93992e5f32ef83fdf.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/sql_update.cc')
| -rw-r--r-- | sql/sql_update.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/sql_update.cc b/sql/sql_update.cc index eac8d91b3f5..e8a9bd771f7 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -2485,6 +2485,7 @@ int multi_update::send_data(List<Item> ¬_used_values) { TABLE_LIST *cur_table; DBUG_ENTER("multi_update::send_data"); + int error= 0; for (cur_table= update_tables; cur_table; cur_table= cur_table->next_local) { @@ -2531,7 +2532,6 @@ int multi_update::send_data(List<Item> ¬_used_values) found++; if (!can_compare_record || compare_record(table)) { - int error; if ((error= cur_table->view_check_option(thd, ignore)) != VIEW_CHECK_OK) @@ -2614,7 +2614,6 @@ error: } else { - int error; TABLE *tmp_table= tmp_tables[offset]; if (copy_funcs(tmp_table_param[offset].items_to_copy, thd)) DBUG_RETURN(1); |