1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00

BUG#17138: Stored procedure error

Review fixes


mysql-test/r/partition.result:
  Review fixes
mysql-test/t/partition.test:
  Review fixes
sql/sql_insert.cc:
  Fixed a bug
This commit is contained in:
unknown
2006-06-22 10:01:30 -04:00
parent 9ee380cbd3
commit d65b4af29a
3 changed files with 14 additions and 5 deletions

View File

@ -981,8 +981,13 @@ int write_record(THD *thd, TABLE *table,COPY_INFO *info)
goto err;
table->file->restore_auto_increment(); // it's too early here! BUG#20188
is_duplicate_key_error= table->file->is_fatal_error(error, 0);
if (info->ignore && !is_duplicate_key_error)
goto ok_or_after_trg_err;
if (!is_duplicate_key_error)
{
if (info->ignore)
goto ok_or_after_trg_err;
else
goto err;
}
if ((int) (key_nr = table->file->get_dup_key(error)) < 0)
{
error=HA_ERR_FOUND_DUPP_KEY; /* Database can't find key */