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

Patch for push of wl1354 Partitioning

Browse Source
This commit is contained in:
unknown
2005-07-18 13:31:02 +02:00
parent 22545f4777
commit cd483c5520
99 changed files with 14672 additions and 594 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sql/sql_update.cc
View File

@@ -148,7 +148,7 @@ int mysql_update(THD *thd,
/* pass counter value */
thd->lex->table_count= table_count;
/* convert to multiupdate */
return 2;
DBUG_RETURN(2);
}
if (lock_tables(thd, table_list, table_count) ||
@@ -265,7 +265,12 @@ int mysql_update(THD *thd,
else
used_key_is_modified=0;
#ifdef HAVE_PARTITION_DB
if (used_key_is_modified || order ||
partition_key_modified(table, fields))
#else
if (used_key_is_modified || order)
#endif
{
/*
We can't update table directly; We must first search after all
@@ -452,8 +457,8 @@ int mysql_update(THD *thd,
call then it should be included in the count of dup_key_found
and error should be set to 0 (only if these errors are ignored).
*/
error= table->file->bulk_update_row(table->record[0],
table->record[1],
error= table->file->bulk_update_row(table->record[1],
table->record[0],
&dup_key_found);
limit+= dup_key_found;
updated-= dup_key_found;