diff options
| author | unknown <bell@sanja.is.com.ua> | 2005-04-30 19:27:22 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2005-04-30 19:27:22 +0300 |
| commit | d617da7cdaa794171ea86f73a63aa0e1275d14f8 (patch) | |
| tree | 26ceeb7a8b19d3bf9999ce1995bc5b3f49f72252 | |
| parent | b94d7b5af53aa061ceab008a1ffc5e61aecbc1ae (diff) | |
| download | mariadb-git-d617da7cdaa794171ea86f73a63aa0e1275d14f8.tar.gz | |
postreview changes
sql/item.cc:
changed parameters order
sql/item.h:
changed parameters order
sql/sql_base.cc:
fixed comment
changed parameters order
| -rw-r--r-- | sql/item.cc | 4 | ||||
| -rw-r--r-- | sql/item.h | 2 | ||||
| -rw-r--r-- | sql/sql_base.cc | 7 |
3 files changed, 8 insertions, 5 deletions
diff --git a/sql/item.cc b/sql/item.cc index 9902b14ece5..a2649d7506f 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -2367,8 +2367,8 @@ static void mark_as_dependent(THD *thd, SELECT_LEX *last, SELECT_LEX *current, SYNOPSIS mark_select_range_as_dependent() thd - thread handler - current_sel - current select (select where resolved_item was placed) last_select - select where resolved_item was resolved + current_sel - current select (select where resolved_item was placed) found_field - field which was found during resolving found_item - Item which was found during resolving (if resolved identifier belongs to VIEW) @@ -2383,8 +2383,8 @@ static void mark_as_dependent(THD *thd, SELECT_LEX *last, SELECT_LEX *current, */ void mark_select_range_as_dependent(THD *thd, - SELECT_LEX *current_sel, SELECT_LEX *last_select, + SELECT_LEX *current_sel, Field *found_field, Item *found_item, Item_ident *resolved_item) { diff --git a/sql/item.h b/sql/item.h index 9a00b2f0d82..fd7c6d0edc3 100644 --- a/sql/item.h +++ b/sql/item.h @@ -1797,8 +1797,8 @@ public: class st_select_lex; void mark_select_range_as_dependent(THD *thd, - st_select_lex *current_sel, st_select_lex *last_select, + st_select_lex *current_sel, Field *found_field, Item *found_item, Item_ident *resolved_item); diff --git a/sql/sql_base.cc b/sql/sql_base.cc index f6147080b9c..30780eb1802 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -2692,9 +2692,12 @@ find_field_in_tables(THD *thd, Item_ident *item, TABLE_LIST *tables, { SELECT_LEX *current_sel= thd->lex->current_select; SELECT_LEX *last_select= item->cached_table->select_lex; - /* check that field was resolved in outer query */ + /* + If the field was an outer referencee, mark all selects using this + sub query as dependent of the outer query + */ if (current_sel != last_select) - mark_select_range_as_dependent(thd, current_sel, last_select, + mark_select_range_as_dependent(thd, last_select, current_sel, found, *ref, item); } return found; |