diff options
| author | unknown <mikael@dator5.(none)> | 2006-07-01 00:19:23 -0400 |
|---|---|---|
| committer | unknown <mikael@dator5.(none)> | 2006-07-01 00:19:23 -0400 |
| commit | a8e6d7f6e2400018f54f56951db42219d241d4da (patch) | |
| tree | bc6487dcd7341f813a9d769da390fa79dd580569 /sql/sql_table.cc | |
| parent | 936fcddb7e7a7223ddffa38080c55cc350ef5c43 (diff) | |
| parent | c92b025b3a98f02b26678cfd14dba2d169f980c8 (diff) | |
| download | mariadb-git-a8e6d7f6e2400018f54f56951db42219d241d4da.tar.gz | |
Merge dator5.(none):/home/pappa/clean-mysql-5.1
into dator5.(none):/home/pappa/bug17138
BUILD/compile-pentium-gcov:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
sql/handler.h:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.cc:
Auto merged
Diffstat (limited to 'sql/sql_table.cc')
| -rw-r--r-- | sql/sql_table.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 7d8631e3236..d68de63e3b8 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -6322,12 +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) || - (error != HA_ERR_FOUND_DUPP_KEY && - error != HA_ERR_FOUND_DUPP_UNIQUE)) + if (!ignore || handle_duplicates != DUP_ERROR || + to->file->is_fatal_error(error, HA_CHECK_DUP)) { - if (error == HA_ERR_FOUND_DUPP_KEY) + if (!to->file->is_fatal_error(error, HA_CHECK_DUP)) { uint key_nr= to->file->get_dup_key(error); if ((int) key_nr >= 0) |