Commit d45f95f0 authored by unknown's avatar unknown

postreview changes


sql/item.cc:
  changed parameters order
sql/item.h:
  changed parameters order
sql/sql_base.cc:
  fixed comment
  changed parameters order
parent b3b97e05
...@@ -2367,8 +2367,8 @@ static void mark_as_dependent(THD *thd, SELECT_LEX *last, SELECT_LEX *current, ...@@ -2367,8 +2367,8 @@ static void mark_as_dependent(THD *thd, SELECT_LEX *last, SELECT_LEX *current,
SYNOPSIS SYNOPSIS
mark_select_range_as_dependent() mark_select_range_as_dependent()
thd - thread handler thd - thread handler
current_sel - current select (select where resolved_item was placed)
last_select - select where resolved_item was resolved 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_field - field which was found during resolving
found_item - Item which was found during resolving (if resolved found_item - Item which was found during resolving (if resolved
identifier belongs to VIEW) identifier belongs to VIEW)
...@@ -2383,8 +2383,8 @@ static void mark_as_dependent(THD *thd, SELECT_LEX *last, SELECT_LEX *current, ...@@ -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, void mark_select_range_as_dependent(THD *thd,
SELECT_LEX *current_sel,
SELECT_LEX *last_select, SELECT_LEX *last_select,
SELECT_LEX *current_sel,
Field *found_field, Item *found_item, Field *found_field, Item *found_item,
Item_ident *resolved_item) Item_ident *resolved_item)
{ {
......
...@@ -1797,8 +1797,8 @@ public: ...@@ -1797,8 +1797,8 @@ public:
class st_select_lex; class st_select_lex;
void mark_select_range_as_dependent(THD *thd, void mark_select_range_as_dependent(THD *thd,
st_select_lex *current_sel,
st_select_lex *last_select, st_select_lex *last_select,
st_select_lex *current_sel,
Field *found_field, Item *found_item, Field *found_field, Item *found_item,
Item_ident *resolved_item); Item_ident *resolved_item);
......
...@@ -2692,9 +2692,12 @@ find_field_in_tables(THD *thd, Item_ident *item, TABLE_LIST *tables, ...@@ -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 *current_sel= thd->lex->current_select;
SELECT_LEX *last_select= item->cached_table->select_lex; 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) 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); found, *ref, item);
} }
return found; return found;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment