← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_yacc.yy

  • Committer: Brian Aker
  • Date: 2008-10-08 22:44:20 UTC
  • Revision ID: brian@tangent.org-20081008224420-h2gg4bpj3ngdch1f
Removed dead code around SHOW commands (I_S exist for collations/charsets)

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_yacc.yy
513
513
%token  ERRORS
514
514
%token  ESCAPED
515
515
%token  ESCAPE_SYM                    /* SQL-2003-R */
516
 
%token  EVENTS_SYM
517
516
%token  EXCLUSIVE_SYM
518
517
%token  EXISTS                        /* SQL-2003-R */
519
518
%token  EXIT_SYM
5159
5158
          {
5160
5159
            Lex->sql_command = SQLCOM_SHOW_BINLOGS;
5161
5160
          }
5162
 
        | BINLOG_SYM EVENTS_SYM binlog_in binlog_from
5163
 
          {
5164
 
            LEX *lex= Lex;
5165
 
            lex->sql_command= SQLCOM_SHOW_BINLOG_EVENTS;
5166
 
          } opt_limit_clause_init
5167
5161
        | keys_or_index from_or_in table_ident opt_db where_clause
5168
5162
          {
5169
5163
            LEX *lex= Lex;
5199
5193
            if (prepare_schema_table(YYTHD, lex, 0, SCH_VARIABLES))
5200
5194
              DRIZZLE_YYABORT;
5201
5195
          }
5202
 
        | charset show_wild
5203
 
          {
5204
 
            LEX *lex= Lex;
5205
 
            lex->sql_command= SQLCOM_SHOW_CHARSETS;
5206
 
            if (prepare_schema_table(YYTHD, lex, 0, SCH_CHARSETS))
5207
 
              DRIZZLE_YYABORT;
5208
 
          }
5209
 
        | COLLATION_SYM show_wild
5210
 
          {
5211
 
            LEX *lex= Lex;
5212
 
            lex->sql_command= SQLCOM_SHOW_COLLATIONS;
5213
 
            if (prepare_schema_table(YYTHD, lex, 0, SCH_COLLATIONS))
5214
 
              DRIZZLE_YYABORT;
5215
 
          }
5216
5196
        | CREATE DATABASE opt_if_not_exists ident
5217
5197
          {
5218
5198
            Lex->sql_command=SQLCOM_SHOW_CREATE_DB;
5255
5235
        | IN_SYM
5256
5236
        ;
5257
5237
 
5258
 
binlog_in:
5259
 
          /* empty */            { Lex->mi.log_file_name = 0; }
5260
 
        | IN_SYM TEXT_STRING_sys { Lex->mi.log_file_name = $2.str; }
5261
 
        ;
5262
 
 
5263
 
binlog_from:
5264
 
          /* empty */        { Lex->mi.pos = 4; /* skip magic number */ }
5265
 
        | FROM ulonglong_num { Lex->mi.pos = $2; }
5266
 
        ;
5267
 
 
5268
5238
show_wild:
5269
5239
          /* empty */
5270
5240
        | LIKE TEXT_STRING_sys
6132
6102
        | ENGINE_SYM               {}
6133
6103
        | ERRORS                   {}
6134
6104
        | ESCAPE_SYM               {}
6135
 
        | EVENTS_SYM               {}
6136
6105
        | EXCLUSIVE_SYM            {}
6137
6106
        | EXTENDED_SYM             {}
6138
6107
        | EXTENT_SIZE_SYM          {}