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

Merge polly.local:/home/kaa/src/maint/bug22364/my50-bug22364

Browse Source 
into  polly.local:/home/kaa/src/maint/mysql-5.0-maint


sql/sql_update.cc:
  Auto merged
This commit is contained in:
unknown
2007-04-26 20:51:02 +04:00
parent 48a9d2c311 c705567e9c
commit 7c52ea634b
3 changed files with 99 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
sql/sql_update.cc
View File

@@ -1354,19 +1354,18 @@ bool multi_update::send_data(List<Item> &not_used_values)
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= tmp_table->file->write_row(tmp_table->record[0]);
if (error != HA_ERR_FOUND_DUPP_KEY && error != HA_ERR_FOUND_DUPP_UNIQUE)
{
if (error != HA_ERR_FOUND_DUPP_KEY &&
error != HA_ERR_FOUND_DUPP_UNIQUE &&
if (error &&
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
tmp_table_param + offset, error, 1))
{
do_update= 0;
DBUG_RETURN(1); // Not a table_is_full error
}
found++;
}
}
}
DBUG_RETURN(0);