database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

After merge fix.

Browse Source
This commit is contained in:
svoj@mysql.com/april.(none)
2006-12-27 19:54:49 +04:00
parent 2fc0bca6a4
commit fb01230ac5
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/sql_update.cc
View File

@@ -1079,10 +1079,11 @@ int multi_update::prepare(List<Item> &not_used_values,
*/
static bool safe_update_on_fly(THD *thd, JOIN_TAB *join_tab,
TABLE_LIST *all_tables, List<Item> *fields)
TABLE_LIST *table_ref, TABLE_LIST *all_tables,
List<Item> *fields)
{
TABLE *table= join_tab->table;
if (unique_table(thd, table, all_tables))
if (unique_table(thd, table_ref, all_tables))
return 0;
switch (join_tab->type) {
case JT_SYSTEM:
@@ -1142,7 +1143,8 @@ multi_update::initialize_tables(JOIN *join)
table->file->extra(HA_EXTRA_IGNORE_DUP_KEY);
if (table == main_table) // First table in join
{
if (safe_update_on_fly(thd, join->join_tab, all_tables, &temp_fields))
if (safe_update_on_fly(thd, join->join_tab, table_ref, all_tables,
&temp_fields))
{
table_to_update= main_table; // Update table on the fly
continue;