mirror of
https://github.com/MariaDB/server.git
synced 2025-08-07 00:04:31 +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:
@@ -6322,11 +6322,10 @@ copy_data_between_tables(TABLE *from,TABLE *to,
|
||||
}
|
||||
if ((error=to->file->ha_write_row((byte*) to->record[0])))
|
||||
{
|
||||
if (!ignore ||
|
||||
handle_duplicates != DUP_REPLACE || /* Currently always false */
|
||||
to->file->is_fatal_error(error, HA_CHECK_DUPP))
|
||||
if (!ignore || handle_duplicates != DUP_ERROR ||
|
||||
to->file->is_fatal_error(error, HA_CHECK_DUP))
|
||||
{
|
||||
if (!to->file->is_fatal_error(error, HA_CHECK_DUPP))
|
||||
if (!to->file->is_fatal_error(error, HA_CHECK_DUP))
|
||||
{
|
||||
uint key_nr= to->file->get_dup_key(error);
|
||||
if ((int) key_nr >= 0)
|
||||
|
Reference in New Issue
Block a user