mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-24 01:05:30 +02:00
Code Issues Projects Releases Packages Wiki Activity

Better fix for "Halloween" effect ...

Browse source
This commit is contained in:
unknown 2003-03-12 17:11:48 +02:00
commit 8a2bd0d4ba
4 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

14
sql/sql_update.cc
View file

@ -413,7 +413,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), on_the_fly(1)
do_update(1), trans_safe(0)
{}
@ -538,15 +538,13 @@ multi_update::initialize_tables(JOIN *join)
main_table=join->join_tab->table;
trans_safe= transactional_tables= main_table->file->has_transactions();
log_delayed= trans_safe || main_table->tmp_table != NO_TMP_TABLE;
#ifdef HAVE_INNOBASE_DB
if (main_table->db_type == DB_TYPE_INNODB)
on_the_fly=0;
#endif
table_to_update= (main_table->file->table_flags() & HA_NOT_MULTI_UPDATE) ?
(TABLE *) 0 : main_table;
/* Create a temporary table for all tables after except main table */
for (table_ref= update_tables; table_ref; table_ref=table_ref->next)
{
TABLE *table=table_ref->table;
if (!on_the_fly || table != main_table)
if (table != table_to_update)
{
uint cnt= table_ref->shared;
ORDER group;
@ -626,7 +624,7 @@ bool multi_update::send_data(List<Item> &not_used_values)
uint offset= cur_table->shared;
table->file->position(table->record[0]);
if (on_the_fly && table == main_table)
if (table == table_to_update)
{
table->status|= STATUS_UPDATED;
store_record(table,1);
@ -719,7 +717,7 @@ int multi_update::do_updates(bool from_send_error)
for (cur_table= update_tables; cur_table ; cur_table= cur_table->next)
{
table = cur_table->table;
if (on_the_fly && table == main_table)
if (table == table_to_update)
continue; // Already updated
org_updated= updated;