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

BUG#17138: Error in stored procedure

Browse Source 
Review comments
This commit is contained in:
mikael@dator5.(none)
2006-06-21 20:55:33 -04:00
parent cd93441a0a
commit a8e6967c02
11 changed files with 35 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sql/sql_update.cc
View File

@ -542,13 +542,13 @@ int mysql_update(THD *thd,
}
}
else if (!ignore ||
table->file->cannot_ignore_error(error, HA_CHECK_DUPP_KEY))
table->file->is_fatal_error(error, HA_CHECK_DUPP_KEY))
{
/*
If (ignore && error is ignorable) we don't have to
do anything; otherwise...
*/
if (table->file->cannot_ignore_error(error, HA_CHECK_DUPP_KEY))
if (table->file->is_fatal_error(error, HA_CHECK_DUPP_KEY))
thd->fatal_error(); /* Other handler errors are fatal */
table->file->print_error(error,MYF(0));
error= 1;
@ -1424,13 +1424,13 @@ bool multi_update::send_data(List<Item> &not_used_values)
{
updated--;
if (!ignore ||
table->file->cannot_ignore_error(error, HA_CHECK_DUPP_KEY))
table->file->is_fatal_error(error, HA_CHECK_DUPP_KEY))
{
/*
If (ignore && error == is ignorable) we don't have to
do anything; otherwise...
*/
if (table->file->cannot_ignore_error(error, HA_CHECK_DUPP_KEY))
if (table->file->is_fatal_error(error, HA_CHECK_DUPP_KEY))
thd->fatal_error(); /* Other handler errors are fatal */
table->file->print_error(error,MYF(0));
DBUG_RETURN(1);
@ -1459,7 +1459,7 @@ bool multi_update::send_data(List<Item> &not_used_values)
/* Write row, ignoring duplicated updates to a row */
if ((error= tmp_table->file->ha_write_row(tmp_table->record[0])))
{
if (tmp_table->file->cannot_ignore_error(error, HA_CHECK_DUPP) &&
if (tmp_table->file->is_fatal_error(error, HA_CHECK_DUPP) &&
create_myisam_from_heap(thd, tmp_table,
tmp_table_param + offset, error, 1))
{
@ -1583,7 +1583,7 @@ int multi_update::do_updates(bool from_send_error)
table->record[0])))
{
if (!ignore ||
table->file->cannot_ignore_error(local_error, HA_CHECK_DUPP_KEY))
table->file->is_fatal_error(local_error, HA_CHECK_DUPP_KEY))
goto err;
}
updated++;