← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_yacc.yy

  • Committer: Lee Bieber
  • Date: 2011-02-21 21:20:44 UTC
  • mfrom: (2187.1.2 build)
  • Revision ID: kalebral@gmail.com-20110221212044-x1j9pmv0230febuz
Merge Brian - getLex() usage and fix for table_name creation during admin commands.
Merge Olaf - Use List::begin() and Use List::iterator instead of List_iterator_fast

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_yacc.yy
33
33
 
34
34
#define YYINITDEPTH 100
35
35
#define YYMAXDEPTH 3200                        /* Because of 64K stack */
36
 
#define Lex (YYSession->lex)
 
36
#define Lex (session->getLex())
37
37
 
38
38
#include <config.h>
39
39
#include <cstdio>
776
776
query:
777
777
          END_OF_INPUT
778
778
          {
779
 
            if (!(YYSession->lex->select_lex.options & OPTION_FOUND_COMMENT))
 
779
            if (!(YYSession->getLex()->select_lex.options & OPTION_FOUND_COMMENT))
780
780
            {
781
781
              my_message(ER_EMPTY_QUERY, ER(ER_EMPTY_QUERY), MYF(0));
782
782
              DRIZZLE_YYABORT;
783
783
            }
784
784
            else
785
785
            {
786
 
              YYSession->lex->statement= new statement::EmptyQuery(YYSession);
 
786
              YYSession->getLex()->statement= new statement::EmptyQuery(YYSession);
787
787
            }
788
788
          }
789
789
        | verb_clause END_OF_INPUT {}
2161
2161
        | select_item
2162
2162
        | '*'
2163
2163
          {
2164
 
            if (YYSession->add_item_to_list( new Item_field(&YYSession->lex->current_select->
2165
 
                                                          context,
2166
 
                                                          NULL, NULL, "*")))
 
2164
            if (YYSession->add_item_to_list( new Item_field(&YYSession->getLex()->current_select->context, NULL, NULL, "*")))
2167
2165
              DRIZZLE_YYABORT;
2168
 
            (YYSession->lex->current_select->with_wild)++;
 
2166
 
 
2167
            (YYSession->getLex()->current_select->with_wild)++;
2169
2168
          }
2170
2169
        ;
2171
2170
 
5403
5402
          }
5404
5403
          order_or_limit
5405
5404
          {
5406
 
            YYSession->lex->current_select->no_table_names_allowed= 0;
 
5405
            YYSession->getLex()->current_select->no_table_names_allowed= 0;
5407
5406
            YYSession->setWhere("");
5408
5407
          }
5409
5408
        ;