diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-01-11 16:29:51 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-01-11 16:29:51 +0200 |
| commit | 8de233af815f28d096ac4ff136525abc3ddc771d (patch) | |
| tree | 98c524bbad2ebdced9635b83e51f647dac978cfc /sql/sql_update.cc | |
| parent | 1015cbde5985e7e89c887ab30ce7c772671194c5 (diff) | |
| parent | fd5e103aa4b97e080dd497b93992e5f32ef83fdf (diff) | |
| download | mariadb-git-8de233af815f28d096ac4ff136525abc3ddc771d.tar.gz | |
Merge 10.4 into 10.5
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 d0956ec8bd1..49d73657689 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -2487,6 +2487,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) { @@ -2533,7 +2534,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) @@ -2616,7 +2616,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); |