diff options
| author | unknown <tim@cane.mysql.fi> | 2000-12-26 17:16:49 +0200 |
|---|---|---|
| committer | unknown <tim@cane.mysql.fi> | 2000-12-26 17:16:49 +0200 |
| commit | 3417bf64020c91fba71149dcb979069768898be9 (patch) | |
| tree | 7ab382658250a3f6a3ec3b9e6f0a33b5aeddde54 /sql/sql_table.cc | |
| parent | 9b3ebee23cf66bbff5843cd051c5eaa492446bdf (diff) | |
| download | mariadb-git-3417bf64020c91fba71149dcb979069768898be9.tar.gz | |
ha_berkeley.cc - Don't use subtransactions in update_row by default
ha_berkeley.cc - Use the DB_RMW (read, modify, write) flag when removing a key
ha_berkeley.h - Don't use subtransactions in update_row by default
sql_table.cc - Don't use subtransactions in update_row by default
bdb.result BitKeeper file /usr/home/tim/my/work/mysql-test/r/bdb.result
bdb.test BitKeeper file /usr/home/tim/my/work/mysql-test/t/bdb.test
sql/ha_berkeley.cc:
- Don't use subtransactions in update_row by default
- Use the DB_RMW (read, modify, write) flag when removing a key
sql/ha_berkeley.h:
- Don't use subtransactions in update_row by default
sql/sql_table.cc:
- Don't use subtransactions in update_row by default
Diffstat (limited to 'sql/sql_table.cc')
| -rw-r--r-- | sql/sql_table.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 332537cad4e..500dd045e90 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -1658,7 +1658,8 @@ copy_data_between_tables(TABLE *from,TABLE *to, }; init_read_record(&info, thd, from, (SQL_SELECT *) 0, 1,1); - if (handle_duplicates == DUP_IGNORE) + if (handle_duplicates == DUP_IGNORE || + handle_duplicates == DUP_REPLACE) to->file->extra(HA_EXTRA_IGNORE_DUP_KEY); next_field=to->next_number_field; while (!(error=info.read_record(&info))) @@ -1675,7 +1676,8 @@ copy_data_between_tables(TABLE *from,TABLE *to, copy_ptr->do_copy(copy_ptr); if ((error=to->file->write_row((byte*) to->record[0]))) { - if (handle_duplicates != DUP_IGNORE || + if ((handle_duplicates != DUP_IGNORE && + handle_duplicates != DUP_REPLACE) || (error != HA_ERR_FOUND_DUPP_KEY && error != HA_ERR_FOUND_DUPP_UNIQUE)) { |