Commit 188b3283 authored by Oleksandr Byelkin's avatar Oleksandr Byelkin

Urgent fix of MDEV-23446 fix:

Use the same variable in both scopes (from where we have "goto error" and target of the goto)
parent d846b55d
...@@ -2347,6 +2347,7 @@ int multi_update::send_data(List<Item> &not_used_values) ...@@ -2347,6 +2347,7 @@ int multi_update::send_data(List<Item> &not_used_values)
{ {
TABLE_LIST *cur_table; TABLE_LIST *cur_table;
DBUG_ENTER("multi_update::send_data"); DBUG_ENTER("multi_update::send_data");
int error= 0;
for (cur_table= update_tables; cur_table; cur_table= cur_table->next_local) for (cur_table= update_tables; cur_table; cur_table= cur_table->next_local)
{ {
...@@ -2393,7 +2394,6 @@ int multi_update::send_data(List<Item> &not_used_values) ...@@ -2393,7 +2394,6 @@ int multi_update::send_data(List<Item> &not_used_values)
found++; found++;
if (!can_compare_record || compare_record(table)) if (!can_compare_record || compare_record(table))
{ {
int error;
if ((error= cur_table->view_check_option(thd, ignore)) != if ((error= cur_table->view_check_option(thd, ignore)) !=
VIEW_CHECK_OK) VIEW_CHECK_OK)
...@@ -2476,7 +2476,6 @@ int multi_update::send_data(List<Item> &not_used_values) ...@@ -2476,7 +2476,6 @@ int multi_update::send_data(List<Item> &not_used_values)
} }
else else
{ {
int error;
TABLE *tmp_table= tmp_tables[offset]; TABLE *tmp_table= tmp_tables[offset];
if (copy_funcs(tmp_table_param[offset].items_to_copy, thd)) if (copy_funcs(tmp_table_param[offset].items_to_copy, thd))
DBUG_RETURN(1); DBUG_RETURN(1);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment