database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +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

8
sql/sql_acl.cc
View File

@ -2049,7 +2049,7 @@ static int replace_user_table(THD *thd, TABLE *table, const LEX_USER &combo,
}
else if ((error=table->file->ha_write_row(table->record[0]))) // insert
{ // This should never happen
if (table->file->cannot_ignore_error(error, HA_CHECK_DUPP))
if (table->file->is_fatal_error(error, HA_CHECK_DUPP))
{
table->file->print_error(error,MYF(0)); /* purecov: deadcode */
error= -1; /* purecov: deadcode */
@ -2171,7 +2171,7 @@ static int replace_db_table(TABLE *table, const char *db,
}
else if (rights && (error= table->file->ha_write_row(table->record[0])))
{
if (table->file->cannot_ignore_error(error, HA_CHECK_DUPP_KEY))
if (table->file->is_fatal_error(error, HA_CHECK_DUPP_KEY))
goto table_error; /* purecov: deadcode */
}
@ -2743,7 +2743,7 @@ static int replace_table_table(THD *thd, GRANT_TABLE *grant_table,
else
{
error=table->file->ha_write_row(table->record[0]);
if (table->file->cannot_ignore_error(error, HA_CHECK_DUPP_KEY))
if (table->file->is_fatal_error(error, HA_CHECK_DUPP_KEY))
goto table_error; /* purecov: deadcode */
}
@ -2861,7 +2861,7 @@ static int replace_routine_table(THD *thd, GRANT_NAME *grant_name,
else
{
error=table->file->ha_write_row(table->record[0]);
if (table->file->cannot_ignore_error(error, HA_CHECK_DUPP_KEY))
if (table->file->is_fatal_error(error, HA_CHECK_DUPP_KEY))
goto table_error;
}