database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

BUG#17138: Error in stored procedure

Browse Source 
Review comments


mysql-test/t/partition.test:
  Changed procedure names ensured procedures were dropped
sql/ha_ndbcluster.h:
  Improved name of method
sql/ha_partition.h:
  Improved name of method
sql/handler.h:
  Improved name of method
  Removed deprecated constants
sql/item_sum.cc:
  Improved name of method
sql/sql_acl.cc:
  Improved name of method
sql/sql_insert.cc:
  Removed use of HA_WRITE_SKIP and introduced is_fatal_error instead
sql/sql_select.cc:
  Improved name of method
sql/sql_table.cc:
  Improved name of method
  Reintroduced dead code for future possible use
sql/sql_union.cc:
  Improved name of method
sql/sql_update.cc:
  Improved name of method
This commit is contained in:
unknown
2006-06-21 20:55:33 -04:00
parent 9fc2ade279
commit 5329154849
11 changed files with 35 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sql/sql_insert.cc
View File

@ -976,15 +976,16 @@ int write_record(THD *thd, TABLE *table,COPY_INFO *info)
while ((error=table->file->ha_write_row(table->record[0])))
{
uint key_nr;
if (error != HA_WRITE_SKIP)
bool is_duplicate_key_error;
if (table->file->is_fatal_error(error, HA_CHECK_DUPP))
goto err;
table->file->restore_auto_increment(); // it's too early here! BUG#20188
if (info->ignore &&
!table->file->cannot_ignore_error(error, 0))
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 ((int) (key_nr = table->file->get_dup_key(error)) < 0)
{
error=HA_WRITE_SKIP; /* Database can't find key */
error=HA_ERR_FOUND_DUPP_KEY; /* Database can't find key */
goto err;
}
/* Read all columns for the row we are going to replace */
@ -1066,7 +1067,7 @@ int write_record(THD *thd, TABLE *table,COPY_INFO *info)
table->record[0])))
{
if (info->ignore &&
!table->file->cannot_ignore_error(error, HA_CHECK_DUPP_KEY))
!table->file->is_fatal_error(error, HA_CHECK_DUPP_KEY))
goto ok_or_after_trg_err;
goto err;
}
@ -1152,7 +1153,7 @@ int write_record(THD *thd, TABLE *table,COPY_INFO *info)
else if ((error=table->file->ha_write_row(table->record[0])))
{
if (!info->ignore ||
table->file->cannot_ignore_error(error, HA_CHECK_DUPP))
table->file->is_fatal_error(error, HA_CHECK_DUPP))
goto err;
table->file->restore_auto_increment();
}