database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Manually merged

Browse Source 
mysql-test/r/update.result:
  Auto merged
mysql-test/t/update.test:
  Auto merged
ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
sql/sql_update.cc:
  Auto merged
This commit is contained in:
unknown
2005-12-02 19:42:14 +03:00
parent 110b887c4e f173e09f0d
commit 454e085291
7 changed files with 105 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sql/sql_update.cc
View File

@@ -1290,22 +1290,23 @@ bool multi_update::send_data(List<Item> &not_used_values)
int error;
TABLE *tmp_table= tmp_tables[offset];
fill_record(thd, tmp_table->field+1, *values_for_table[offset], 1);
found++;
/* Store pointer to row */
memcpy((char*) tmp_table->field[0]->ptr,
(char*) table->file->ref, table->file->ref_length);
/* Write row, ignoring duplicated updates to a row */
if ((error= tmp_table->file->write_row(tmp_table->record[0])) &&
(error != HA_ERR_FOUND_DUPP_KEY &&
error != HA_ERR_FOUND_DUPP_UNIQUE))
if (error= tmp_table->file->write_row(tmp_table->record[0]))
{
if (create_myisam_from_heap(thd, tmp_table, tmp_table_param + offset,
error, 1))
if (error != HA_ERR_FOUND_DUPP_KEY &&
error != HA_ERR_FOUND_DUPP_UNIQUE &&
create_myisam_from_heap(thd, tmp_table,
tmp_table_param + offset, error, 1))
{
do_update=0;
DBUG_RETURN(1); // Not a table_is_full error
}
}
else
found++;
}
}
DBUG_RETURN(0);