diff options
| author | monty@mysql.com <> | 2005-08-15 18:35:48 +0300 |
|---|---|---|
| committer | monty@mysql.com <> | 2005-08-15 18:35:48 +0300 |
| commit | 1a6f16edd94570eb8359e94149d5393d3dd82888 (patch) | |
| tree | 613842f6646a144777e4e07d77c2a89dbb659781 /sql/sql_update.cc | |
| parent | d0c66bbaa3446f44a1cdd38ffde7527c0a058e2d (diff) | |
| parent | 4880d22b79fc3ab486a4ec0b4f267bfbe06b367c (diff) | |
| download | mariadb-git-1a6f16edd94570eb8359e94149d5393d3dd82888.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
Diffstat (limited to 'sql/sql_update.cc')
| -rw-r--r-- | sql/sql_update.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/sql_update.cc b/sql/sql_update.cc index 1a9ef2fff62..b596420692a 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -555,7 +555,7 @@ bool mysql_prepare_update(THD *thd, TABLE_LIST *table_list, tables.table= table; tables.alias= table_list->alias; - if (setup_tables(thd, &select_lex->context, + if (setup_tables(thd, &select_lex->context, &select_lex->top_join_list, table_list, conds, &select_lex->leaf_tables, FALSE) || setup_conds(thd, table_list, select_lex->leaf_tables, conds) || @@ -643,6 +643,7 @@ bool mysql_multi_update_prepare(THD *thd) */ if (setup_tables(thd, &lex->select_lex.context, + &lex->select_lex.top_join_list, table_list, &lex->select_lex.where, &lex->select_lex.leaf_tables, FALSE)) DBUG_RETURN(TRUE); @@ -761,6 +762,7 @@ bool mysql_multi_update_prepare(THD *thd) tbl->cleanup_items(); if (setup_tables(thd, &lex->select_lex.context, + &lex->select_lex.top_join_list, table_list, &lex->select_lex.where, &lex->select_lex.leaf_tables, FALSE) || setup_fields_with_no_wrap(thd, 0, *fields, 1, 0, 0)) |