database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-5.0

Browse Source 
into  may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-5.1
This commit is contained in:
svoj@may.pils.ru
2006-06-20 16:45:51 +05:00
parent 34d82f0bc6 2c28b3cbf1
commit 1c42c9730d
3 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sql/sql_update.cc
View File

@ -985,7 +985,12 @@ reopen_tables:
}
}
}
/*
Set exclude_from_table_unique_test value back to FALSE. It is needed for
further check in multi_update::prepare whether to use record cache.
*/
lex->select_lex.exclude_from_table_unique_test= FALSE;
if (thd->fill_derived_tables() &&
mysql_handle_derived(lex, &mysql_derived_filling))
DBUG_RETURN(TRUE);
@ -1164,7 +1169,7 @@ int multi_update::prepare(List<Item> &not_used_values,
for (table_ref= leaves; table_ref; table_ref= table_ref->next_leaf)
{
TABLE *table=table_ref->table;
if (!(tables_to_update & table->map) &&
if ((tables_to_update & table->map) &&
unique_table(thd, table_ref, update_tables))
table->no_cache= 1; // Disable row cache
}