At file:///home/psergey/dev/maria-5.3-subqueries-r3/ ------------------------------------------------------------ revno: 2751 revision-id: psergey@askmonty.org-20100208095616-ar502xdhoqqhe3nk parent: psergey@askmonty.org-20100202200045-13q0nb5dwzm739j6 committer: Sergey Petrunya <psergey@askmonty.org> branch nick: maria-5.3-subqueries-r3 timestamp: Mon 2010-02-08 11:56:16 +0200 message: Fix for previous: pass correct parameters to mark_as_dependent. === modified file 'sql/item.cc' --- a/sql/item.cc 2010-02-02 20:00:45 +0000 +++ b/sql/item.cc 2010-02-08 09:56:16 +0000 @@ -4220,7 +4220,7 @@ return -1; mark_as_dependent(thd, last_checked_context->select_lex, - context->select_lex, this, + context->select_lex, rf /*this*/ , //psergey-fix: s/this/rf/ rf); return 0; } @@ -6000,7 +6000,8 @@ goto error; thd->change_item_tree(reference, fld); mark_as_dependent(thd, last_checked_context->select_lex, - thd->lex->current_select, this, fld); + thd->lex->current_select, fld, fld); //psergey-fix-todo: use reference instead? + // was: this, fld) /* A reference is resolved to a nest level that's outer or the same as the nest level of the enclosing set function : adjust the value of