mirror of
https://github.com/MariaDB/server.git
synced 2025-08-31 22:22:30 +03:00
BUG#17138: Crashes in stored procedure
Last round of review fixes BUILD/compile-pentium-gcov: No change sql/ha_ndbcluster.h: Last round of review changes sql/ha_partition.h: Last round of review changes sql/handler.h: Last round of review changes sql/item_sum.cc: Last round of review changes sql/sql_acl.cc: Last round of review changes sql/sql_insert.cc: Last round of review changes sql/sql_select.cc: Last round of review changes sql/sql_table.cc: Last round of review changes sql/sql_union.cc: Last round of review changes sql/sql_update.cc: Last round of review changes
This commit is contained in:
@@ -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->is_fatal_error(error, HA_CHECK_DUPP))
|
||||
if (table->file->is_fatal_error(error, HA_CHECK_DUP))
|
||||
{
|
||||
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->is_fatal_error(error, HA_CHECK_DUPP_KEY))
|
||||
if (table->file->is_fatal_error(error, HA_CHECK_DUP_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->is_fatal_error(error, HA_CHECK_DUPP_KEY))
|
||||
if (table->file->is_fatal_error(error, HA_CHECK_DUP_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->is_fatal_error(error, HA_CHECK_DUPP_KEY))
|
||||
if (table->file->is_fatal_error(error, HA_CHECK_DUP_KEY))
|
||||
goto table_error;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user