diff options
| author | unknown <igor@rurik.mysql.com> | 2003-12-12 13:14:59 -0800 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2003-12-12 13:14:59 -0800 |
| commit | 0a79eedb5d6dfb24640b49288b9fdb003c6b00b2 (patch) | |
| tree | c73f2fa42aee245f5de9dbf9b9628c76fa1cc4db /sql/sql_update.cc | |
| parent | b196f0305527a393781601c0f9e5669375b584c5 (diff) | |
| download | mariadb-git-0a79eedb5d6dfb24640b49288b9fdb003c6b00b2.tar.gz | |
sql_delete.cc, sql_update.cc, sql_class.h:
Simplification of the previous fix for multi-update/delete.
sql/sql_class.h:
Simplification of the previous fix for multi-update/delete.
sql/sql_update.cc:
Simplification of the previous fix for multi-update/delete.
sql/sql_delete.cc:
Simplification of the previous fix for multi-update/delete.
Diffstat (limited to 'sql/sql_update.cc')
| -rw-r--r-- | sql/sql_update.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/sql_update.cc b/sql/sql_update.cc index 19df0661db3..959abcae39c 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -440,7 +440,7 @@ multi_update::multi_update(THD *thd_arg, TABLE_LIST *table_list, :all_tables(table_list), update_tables(0), thd(thd_arg), tmp_tables(0), updated(0), found(0), fields(field_list), values(value_list), table_count(0), copy_field(0), handle_duplicates(handle_duplicates_arg), - do_update(1), trans_safe(0), tmp_tables_inited(0) + do_update(1), trans_safe(0) {} @@ -622,7 +622,6 @@ multi_update::initialize_tables(JOIN *join) DBUG_RETURN(1); tmp_tables[cnt]->file->extra(HA_EXTRA_WRITE_CACHE); } - tmp_tables_inited= 1; DBUG_RETURN(0); } @@ -823,7 +822,7 @@ int multi_update::do_updates(bool from_send_error) do_update= 0; // Don't retry this function - if (!tmp_tables_inited) + if (!found) DBUG_RETURN(0); for (cur_table= update_tables; cur_table ; cur_table= cur_table->next) { |