← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/ref.cc

  • Committer: Monty Taylor
  • Date: 2011-02-13 17:26:39 UTC
  • mfrom: (2157.2.2 give-in-to-pkg-config)
  • mto: This revision was merged to the branch mainline in revision 2166.
  • Revision ID: mordred@inaugust.com-20110213172639-nhy7i72sfhoq13ms
Merged in pkg-config fixes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item/ref.cc
17
17
 *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
18
18
 */
19
19
 
20
 
#include <config.h>
 
20
#include "config.h"
21
21
 
22
 
#include <drizzled/session.h>
23
 
#include <drizzled/error.h>
24
 
#include <drizzled/show.h>
25
 
#include <drizzled/item/ref.h>
26
 
#include <drizzled/plugin/client.h>
27
 
#include <drizzled/item/sum.h>
 
22
#include "drizzled/session.h"
 
23
#include "drizzled/error.h"
 
24
#include "drizzled/show.h"
 
25
#include "drizzled/item/ref.h"
 
26
#include "drizzled/plugin/client.h"
 
27
#include "drizzled/item/sum.h"
28
28
 
29
29
namespace drizzled
30
30
{
113
113
{
114
114
  enum_parsing_place place= NO_MATTER;
115
115
  assert(fixed == 0);
116
 
  Select_Lex *current_sel= session->getLex()->current_select;
 
116
  Select_Lex *current_sel= session->lex->current_select;
117
117
 
118
118
  if (!ref || ref == not_found_item)
119
119
  {
268
268
          goto error;
269
269
        session->change_item_tree(reference, fld);
270
270
        mark_as_dependent(session, last_checked_context->select_lex,
271
 
                          session->getLex()->current_select, this, fld);
 
271
                          session->lex->current_select, this, fld);
272
272
        /*
273
273
          A reference is resolved to a nest level that's outer or the same as
274
274
          the nest level of the enclosing set function : adjust the value of
275
275
          max_arg_level for the function if it's needed.
276
276
        */
277
 
        if (session->getLex()->in_sum_func &&
278
 
            session->getLex()->in_sum_func->nest_level >=
 
277
        if (session->lex->in_sum_func &&
 
278
            session->lex->in_sum_func->nest_level >=
279
279
            last_checked_context->select_lex->nest_level)
280
 
          set_if_bigger(session->getLex()->in_sum_func->max_arg_level,
 
280
          set_if_bigger(session->lex->in_sum_func->max_arg_level,
281
281
                        last_checked_context->select_lex->nest_level);
282
282
        return false;
283
283
      }
297
297
        the nest level of the enclosing set function : adjust the value of
298
298
        max_arg_level for the function if it's needed.
299
299
      */
300
 
      if (session->getLex()->in_sum_func &&
301
 
          session->getLex()->in_sum_func->nest_level >=
 
300
      if (session->lex->in_sum_func &&
 
301
          session->lex->in_sum_func->nest_level >=
302
302
          last_checked_context->select_lex->nest_level)
303
 
        set_if_bigger(session->getLex()->in_sum_func->max_arg_level,
 
303
        set_if_bigger(session->lex->in_sum_func->max_arg_level,
304
304
                      last_checked_context->select_lex->nest_level);
305
305
    }
306
306
  }