diff options
author | unknown <svoj@may.pils.ru> | 2006-06-19 14:13:44 +0500 |
---|---|---|
committer | unknown <svoj@may.pils.ru> | 2006-06-19 14:13:44 +0500 |
commit | 5375bcad698da2c1ebbe33aff5d86ebccc896f4b (patch) | |
tree | 6ca9206354b5aba3578de7d401ebe8d5c97a3d58 /sql | |
parent | 0d165134cc8cea8322e89443f0a0aea2dedb6ca9 (diff) | |
parent | 46cdd39ea68ca4635983a16ecc1d88b5309e43ef (diff) | |
download | mariadb-git-5375bcad698da2c1ebbe33aff5d86ebccc896f4b.tar.gz |
Merge april:devel/BitKeeper/mysql-4.1
into may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-4.1
Diffstat (limited to 'sql')
-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 48a8cf93917..16423b39786 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -862,7 +862,7 @@ int multi_update::prepare(List<Item> ¬_used_values, for (table_ref= all_tables; table_ref; table_ref=table_ref->next) { TABLE *table=table_ref->table; - if (!(tables_to_update & table->map) && + if ((tables_to_update & table->map) && mysql_lock_have_duplicate(thd, table, update_tables)) table->no_cache= 1; // Disable row cache } |