← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/ref.cc

  • Committer: Lee Bieber
  • Date: 2011-03-13 16:37:38 UTC
  • mfrom: (2227.4.18 session2)
  • Revision ID: kalebral@gmail.com-20110313163738-7ti21zk40o2xi3ew
Merge Olaf - Refactor Session

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item/ref.cc
114
114
{
115
115
  enum_parsing_place place= NO_MATTER;
116
116
  assert(fixed == 0);
117
 
  Select_Lex *current_sel= session->getLex()->current_select;
 
117
  Select_Lex *current_sel= session->lex().current_select;
118
118
 
119
119
  if (!ref || ref == not_found_item)
120
120
  {
269
269
          goto error;
270
270
        *reference= fld;
271
271
        mark_as_dependent(session, last_checked_context->select_lex,
272
 
                          session->getLex()->current_select, this, fld);
 
272
                          session->lex().current_select, this, fld);
273
273
        /*
274
274
          A reference is resolved to a nest level that's outer or the same as
275
275
          the nest level of the enclosing set function : adjust the value of
276
276
          max_arg_level for the function if it's needed.
277
277
        */
278
 
        if (session->getLex()->in_sum_func &&
279
 
            session->getLex()->in_sum_func->nest_level >=
 
278
        if (session->lex().in_sum_func &&
 
279
            session->lex().in_sum_func->nest_level >=
280
280
            last_checked_context->select_lex->nest_level)
281
 
          set_if_bigger(session->getLex()->in_sum_func->max_arg_level,
 
281
          set_if_bigger(session->lex().in_sum_func->max_arg_level,
282
282
                        last_checked_context->select_lex->nest_level);
283
283
        return false;
284
284
      }
298
298
        the nest level of the enclosing set function : adjust the value of
299
299
        max_arg_level for the function if it's needed.
300
300
      */
301
 
      if (session->getLex()->in_sum_func &&
302
 
          session->getLex()->in_sum_func->nest_level >=
 
301
      if (session->lex().in_sum_func &&
 
302
          session->lex().in_sum_func->nest_level >=
303
303
          last_checked_context->select_lex->nest_level)
304
 
        set_if_bigger(session->getLex()->in_sum_func->max_arg_level,
 
304
        set_if_bigger(session->lex().in_sum_func->max_arg_level,
305
305
                      last_checked_context->select_lex->nest_level);
306
306
    }
307
307
  }