diff options
| author | unknown <gluh@mysql.com/eagle.(none)> | 2007-02-26 16:57:45 +0400 |
|---|---|---|
| committer | unknown <gluh@mysql.com/eagle.(none)> | 2007-02-26 16:57:45 +0400 |
| commit | de5d4e32fbd82ad4bb3749920d5c779f8eba8ec6 (patch) | |
| tree | ce94fd69807e8bbcf533f566abc9f22a2a3a72cf /sql/sql_update.cc | |
| parent | 8c336fbc46fd3e8d1a7cc073883270c5a2ac3cc8 (diff) | |
| parent | 90d4f80922c7f8873ed8c415303f8d7276f5e32d (diff) | |
| download | mariadb-git-de5d4e32fbd82ad4bb3749920d5c779f8eba8ec6.tar.gz | |
Merge mysql.com:/home/gluh/MySQL/Merge/5.0
into mysql.com:/home/gluh/MySQL/Merge/5.0-opt
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_union.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/sql_update.cc')
| -rw-r--r-- | sql/sql_update.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/sql_update.cc b/sql/sql_update.cc index d43289d147d..4858184557b 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -133,6 +133,7 @@ int mysql_update(THD *thd, READ_RECORD info; SELECT_LEX *select_lex= &thd->lex->select_lex; bool need_reopen; + List<Item> all_fields; DBUG_ENTER("mysql_update"); LINT_INIT(timestamp_query_id); @@ -225,6 +226,10 @@ int mysql_update(THD *thd, DBUG_RETURN(1); /* purecov: inspected */ } + if (select_lex->inner_refs_list.elements && + fix_inner_refs(thd, all_fields, select_lex, select_lex->ref_pointer_array)) + DBUG_RETURN(-1); + if (conds) { Item::cond_result cond_value; |