diff options
| author | sergefp@mysql.com <> | 2006-01-04 11:25:48 +0300 |
|---|---|---|
| committer | sergefp@mysql.com <> | 2006-01-04 11:25:48 +0300 |
| commit | 56ba8abd12033efdf03f9faa2745db89a004f519 (patch) | |
| tree | 8309c4e26a7122eb5f6d7085c64822c3085347c5 /sql/sql_update.cc | |
| parent | a410de984a4af158a35b80e0243b55c687f74f38 (diff) | |
| parent | 7c3fe127e0a2219e8cf98315340437d37b4e0a32 (diff) | |
| download | mariadb-git-56ba8abd12033efdf03f9faa2745db89a004f519.tar.gz | |
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/home/psergey/mysql-5.1-ppruning-r4
Diffstat (limited to 'sql/sql_update.cc')
| -rw-r--r-- | sql/sql_update.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_update.cc b/sql/sql_update.cc index 65d1beeaf3b..62ea4e89eff 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -1415,7 +1415,7 @@ bool multi_update::send_data(List<Item> ¬_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->ha_write_row(tmp_table->record[0])) + if ((error= tmp_table->file->ha_write_row(tmp_table->record[0]))) { if (error != HA_ERR_FOUND_DUPP_KEY && error != HA_ERR_FOUND_DUPP_UNIQUE && |