diff options
| author | unknown <ingo@mysql.com> | 2005-12-27 10:36:19 +0100 |
|---|---|---|
| committer | unknown <ingo@mysql.com> | 2005-12-27 10:36:19 +0100 |
| commit | 4b543591b08fe8087d45fd70f4bf403e9508c3fe (patch) | |
| tree | f0710f27c187d5bbfb5ce951c51e58a46f9c7b7c /sql/sql_update.cc | |
| parent | c2ac089167ac158aff1318cdb94c55a48fae34a5 (diff) | |
| parent | 1d6ba45e98918585a6ac9f683dce4154e1facf10 (diff) | |
| download | mariadb-git-4b543591b08fe8087d45fd70f4bf403e9508c3fe.tar.gz | |
Merge mysql.com:/home/mydev/mysql-4.1
into mysql.com:/home/mydev/mysql-4.1-bug5390
libmysqld/ha_blackhole.cc:
Auto merged
sql/sql_update.cc:
Auto merged
Diffstat (limited to 'sql/sql_update.cc')
| -rw-r--r-- | sql/sql_update.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/sql_update.cc b/sql/sql_update.cc index 7b1d5988bde..24c7a278e79 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -854,8 +854,7 @@ int multi_update::prepare(List<Item> ¬_used_values, { TABLE *table=table_ref->table; if (!(tables_to_update & table->map) && - find_real_table_in_list(update_tables, table_ref->db, - table_ref->real_name)) + mysql_lock_have_duplicate(thd, table, update_tables)) table->no_cache= 1; // Disable row cache } DBUG_RETURN(thd->is_fatal_error != 0); |