diff options
| author | gluh@mysql.com/eagle.(none) <> | 2007-02-26 16:57:45 +0400 |
|---|---|---|
| committer | gluh@mysql.com/eagle.(none) <> | 2007-02-26 16:57:45 +0400 |
| commit | e8635ad3cb1e934a5214913f52e48e87df980122 (patch) | |
| tree | ce94fd69807e8bbcf533f566abc9f22a2a3a72cf /sql/sql_update.cc | |
| parent | 01ea1aa44d4d1ab0abb288f8b6b4627c19a052c9 (diff) | |
| parent | d9831e91a19c46aa5e373b682e26ca23bc048c40 (diff) | |
| download | mariadb-git-e8635ad3cb1e934a5214913f52e48e87df980122.tar.gz | |
Merge mysql.com:/home/gluh/MySQL/Merge/5.0
into mysql.com:/home/gluh/MySQL/Merge/5.0-opt
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; |