← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_yacc.yy

  • Committer: Andrew Hutchings
  • Date: 2011-02-07 17:20:59 UTC
  • mfrom: (2148 staging)
  • mto: (2148.2.3 build)
  • mto: This revision was merged to the branch mainline in revision 2149.
  • Revision ID: andrew@linuxjedi.co.uk-20110207172059-dyeahrgzrlincoe3
Merge with trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_yacc.yy
2097
2097
          /* empty */ {}
2098
2098
        | AFTER_SYM ident
2099
2099
          {
2100
 
            statement::AlterTable *statement= (statement::AlterTable *)Lex->statement;
2101
 
 
2102
 
            store_position_for_column($2.str);
2103
 
            statement->alter_info.flags.set(ALTER_COLUMN_ORDER);
 
2100
            parser::storeAlterColumnPosition(Lex, $2.str);
2104
2101
          }
2105
2102
        | FIRST_SYM
2106
2103
          {
2107
 
            statement::AlterTable *statement= (statement::AlterTable *)Lex->statement;
2108
 
 
2109
 
            store_position_for_column(first_keyword);
2110
 
            statement->alter_info.flags.set(ALTER_COLUMN_ORDER);
 
2104
            parser::storeAlterColumnPosition(Lex, first_keyword);
2111
2105
          }
2112
2106
        ;
2113
2107
 
4588
4582
           }
4589
4583
        | COUNT_SYM '(' '*' ')' WARNINGS
4590
4584
          {
4591
 
            (void) create_select_for_variable("warning_count");
4592
 
             Lex->statement= new statement::Show(YYSession);
 
4585
            show::buildSelectWarning(YYSession);
4593
4586
          }
4594
4587
        | COUNT_SYM '(' '*' ')' ERRORS
4595
4588
          {
4596
 
            (void) create_select_for_variable("error_count");
4597
 
             Lex->statement= new statement::Show(YYSession);
 
4589
            show::buildSelectError(YYSession);
4598
4590
          }
4599
4591
        | WARNINGS opt_limit_clause_init
4600
4592
          {
4601
 
            if (not show::buildWarnings(YYSession))
4602
 
              DRIZZLE_YYABORT;
 
4593
            show::buildWarnings(YYSession);
4603
4594
          }
4604
4595
        | ERRORS opt_limit_clause_init
4605
4596
          {
4606
 
            if (not show::buildErrors(YYSession))
4607
 
              DRIZZLE_YYABORT;
 
4597
            show::buildErrors(YYSession);
4608
4598
          }
4609
4599
        | opt_var_type STATUS_SYM show_wild
4610
4600
          {