database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

MDEV-23446 goto error cleanup

Browse Source
This commit is contained in:
Aleksey Midenkov
2021-01-25 13:02:28 +03:00
parent d6d3d9ae2f
commit b9d1c6574b
1 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
sql/sql_update.cc
View File

@@ -2350,10 +2350,10 @@ 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)
{ {
int error= 0;
TABLE *table= cur_table->table; TABLE *table= cur_table->table;
uint offset= cur_table->shared; uint offset= cur_table->shared;
/* /*
@@ -2423,21 +2423,7 @@ int multi_update::send_data(List<Item> &not_used_values)
updated--; updated--;
if (!ignore || if (!ignore ||
table->file->is_fatal_error(error, HA_CHECK_ALL)) table->file->is_fatal_error(error, HA_CHECK_ALL))
{ goto error;
error:
/*
If (ignore && error == is ignorable) we don't have to
do anything; otherwise...
*/
myf flags= 0;
if (table->file->is_fatal_error(error, HA_CHECK_ALL))
flags|= ME_FATALERROR; /* Other handler errors are fatal */
prepare_record_for_error_message(error, table);
table->file->print_error(error,MYF(flags));
DBUG_RETURN(1);
}
} }
else else
{ {
@@ -2513,7 +2499,22 @@ error:
} }
} }
} }
} continue;
error:
DBUG_ASSERT(error > 0);
/*
If (ignore && error == is ignorable) we don't have to
do anything; otherwise...
*/
myf flags= 0;
if (table->file->is_fatal_error(error, HA_CHECK_ALL))
flags|= ME_FATALERROR; /* Other handler errors are fatal */
prepare_record_for_error_message(error, table);
table->file->print_error(error,MYF(flags));
DBUG_RETURN(1);
} // for (cur_table)
DBUG_RETURN(0); DBUG_RETURN(0);
} }