mirror of
https://github.com/MariaDB/server.git
synced 2026-01-06 05:22:24 +03:00
BUG#17138: Error in stored procedure
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:
@@ -6269,9 +6269,10 @@ copy_data_between_tables(TABLE *from,TABLE *to,
|
||||
if ((error=to->file->ha_write_row((byte*) to->record[0])))
|
||||
{
|
||||
if (!ignore ||
|
||||
to->file->cannot_ignore_error(error, HA_CHECK_DUPP))
|
||||
handle_duplicates != DUP_REPLACE || /* Currently always false */
|
||||
to->file->is_fatal_error(error, HA_CHECK_DUPP))
|
||||
{
|
||||
if (error == HA_ERR_FOUND_DUPP_KEY)
|
||||
if (!to->file->is_fatal_error(error, HA_CHECK_DUPP))
|
||||
{
|
||||
uint key_nr= to->file->get_dup_key(error);
|
||||
if ((int) key_nr >= 0)
|
||||
|
||||
Reference in New Issue
Block a user