← 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: 2009-09-16 21:56:01 UTC
  • mfrom: (1126.2.5 merge)
  • Revision ID: brian@gaz-20090916215601-o8gy2wmwt0pgfp86
Merge Jay Alter table + Brian dead code

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_yacc.yy
452
452
*/
453
453
 
454
454
%token  ABORT_SYM                     /* INTERNAL (used in lex) */
455
 
%token  ACCESSIBLE_SYM
456
455
%token  ACTION                        /* SQL-2003-N */
457
456
%token  ADD                           /* SQL-2003-R */
458
457
%token  ADDDATE_SYM                   /* MYSQL-FUNC */
459
458
%token  AFTER_SYM                     /* SQL-2003-N */
460
459
%token  AGGREGATE_SYM
461
 
%token  ALGORITHM_SYM
462
460
%token  ALL                           /* SQL-2003-R */
463
461
%token  ALTER                         /* SQL-2003-R */
464
462
%token  ANALYZE_SYM
468
466
%token  ASC                           /* SQL-2003-N */
469
467
%token  ASENSITIVE_SYM                /* FUTURE-USE */
470
468
%token  AT_SYM                        /* SQL-2003-R */
471
 
%token  AUTOEXTEND_SIZE_SYM
472
469
%token  AUTO_INC
473
470
%token  AVG_ROW_LENGTH
474
471
%token  AVG_SYM                       /* SQL-2003-N */
584
581
%token  EXTRACT_SYM                   /* SQL-2003-N */
585
582
%token  FALSE_SYM                     /* SQL-2003-R */
586
583
%token  FAST_SYM
587
 
%token  FAULTS_SYM
588
584
%token  FETCH_SYM                     /* SQL-2003-R */
589
585
%token  COLUMN_FORMAT_SYM
590
586
%token  FILE_SYM
604
600
%token  GROUP_SYM                     /* SQL-2003-R */
605
601
%token  GROUP_CONCAT_SYM
606
602
%token  GT_SYM                        /* OPERATOR */
607
 
%token  HANDLER_SYM
608
603
%token  HASH_SYM
609
604
%token  HAVING                        /* SQL-2003-R */
610
605
%token  HEX_NUM
623
618
%token  INDEXES
624
619
%token  INDEX_SYM
625
620
%token  INFILE
626
 
%token  INITIAL_SIZE_SYM
627
621
%token  INNER_SYM                     /* SQL-2003-R */
628
622
%token  INOUT_SYM                     /* SQL-2003-R */
629
623
%token  INSENSITIVE_SYM               /* SQL-2003-R */
645
639
%token  LAST_SYM                      /* SQL-2003-N */
646
640
%token  LE                            /* OPERATOR */
647
641
%token  LEADING                       /* SQL-2003-R */
648
 
%token  LEAVES
649
642
%token  LEFT                          /* SQL-2003-R */
650
643
%token  LEVEL_SYM
651
644
%token  LEX_HOSTNAME
652
645
%token  LIKE                          /* SQL-2003-R */
653
646
%token  LIMIT
654
 
%token  LINEAR_SYM
655
647
%token  LINES
656
 
%token  LINESTRING
657
648
%token  LIST_SYM
658
649
%token  LOAD
659
650
%token  LOCAL_SYM                     /* SQL-2003-R */
660
651
%token  LOCATOR_SYM                   /* SQL-2003-N */
661
652
%token  LOCKS_SYM
662
653
%token  LOCK_SYM
663
 
%token  LOGFILE_SYM
664
654
%token  LOGS_SYM
665
655
%token  LONG_NUM
666
656
%token  LONG_SYM
858
848
%token  UPDATE_SYM                    /* SQL-2003-R */
859
849
%token  USAGE                         /* SQL-2003-N */
860
850
%token  USER                          /* SQL-2003-R */
861
 
%token  USE_FRM
862
851
%token  USE_SYM
863
852
%token  USING                         /* SQL-2003-R */
864
853
%token  UTC_DATE_SYM
871
860
%token  VARIANCE_SYM
872
861
%token  VARYING                       /* SQL-2003-R */
873
862
%token  VAR_SAMP_SYM
874
 
%token  VIRTUAL_SYM
875
863
%token  WAIT_SYM
876
864
%token  WARNINGS
877
865
%token  WEEK_SYM
1391
1379
          }
1392
1380
        | BLOCK_SIZE_SYM opt_equal ulong_num    
1393
1381
          { 
1394
 
            Lex->create_info.block_size= $3; 
 
1382
            message::Table::TableOptions *tableopts;
 
1383
            tableopts= Lex->create_table_proto->mutable_options();
 
1384
 
 
1385
            tableopts->set_block_size($3);
1395
1386
            Lex->create_info.used_fields|= HA_CREATE_USED_BLOCK_SIZE;
1396
1387
          }
1397
1388
        | COMMENT_SYM opt_equal TEXT_STRING_sys
2213
2204
        | DROP opt_column field_ident
2214
2205
          {
2215
2206
            LEX *lex=Lex;
2216
 
            lex->alter_info.drop_list.push_back(new Alter_drop(Alter_drop::COLUMN,
 
2207
            lex->alter_info.drop_list.push_back(new AlterDrop(AlterDrop::COLUMN,
2217
2208
                                                               $3.str));
2218
2209
            lex->alter_info.flags.set(ALTER_DROP_COLUMN);
2219
2210
          }
2225
2216
        | DROP PRIMARY_SYM KEY_SYM
2226
2217
          {
2227
2218
            LEX *lex=Lex;
2228
 
            lex->alter_info.drop_list.push_back(new Alter_drop(Alter_drop::KEY,
 
2219
            lex->alter_info.drop_list.push_back(new AlterDrop(AlterDrop::KEY,
2229
2220
                                                               "PRIMARY"));
2230
2221
            lex->alter_info.flags.set(ALTER_DROP_INDEX);
2231
2222
          }
2232
2223
        | DROP key_or_index field_ident
2233
2224
          {
2234
2225
            LEX *lex=Lex;
2235
 
            lex->alter_info.drop_list.push_back(new Alter_drop(Alter_drop::KEY,
 
2226
            lex->alter_info.drop_list.push_back(new AlterDrop(AlterDrop::KEY,
2236
2227
                                                               $3.str));
2237
2228
            lex->alter_info.flags.set(ALTER_DROP_INDEX);
2238
2229
          }
2251
2242
        | ALTER opt_column field_ident SET DEFAULT signed_literal
2252
2243
          {
2253
2244
            LEX *lex=Lex;
2254
 
            lex->alter_info.alter_list.push_back(new Alter_column($3.str,$6));
 
2245
            lex->alter_info.alter_list.push_back(new AlterColumn($3.str,$6));
2255
2246
            lex->alter_info.flags.set(ALTER_COLUMN_DEFAULT);
2256
2247
          }
2257
2248
        | ALTER opt_column field_ident DROP DEFAULT
2258
2249
          {
2259
2250
            LEX *lex=Lex;
2260
 
            lex->alter_info.alter_list.push_back(new Alter_column($3.str,
 
2251
            lex->alter_info.alter_list.push_back(new AlterColumn($3.str,
2261
2252
                                                                  (Item*) 0));
2262
2253
            lex->alter_info.flags.set(ALTER_COLUMN_DEFAULT);
2263
2254
          }
4359
4350
            lex->alter_info.reset();
4360
4351
            lex->alter_info.flags.set(ALTER_DROP_INDEX);
4361
4352
            lex->alter_info.build_method= $2;
4362
 
            lex->alter_info.drop_list.push_back(new Alter_drop(Alter_drop::KEY,
 
4353
            lex->alter_info.drop_list.push_back(new AlterDrop(AlterDrop::KEY,
4363
4354
                                                               $4.str));
4364
4355
            if (!lex->current_select->add_table_to_list(lex->session, $6, NULL,
4365
4356
                                                        TL_OPTION_UPDATING))
5512
5503
        | DEALLOCATE_SYM        {}
5513
5504
        | END                   {}
5514
5505
        | FLUSH_SYM             {}
5515
 
        | HANDLER_SYM           {}
5516
5506
        | HOST_SYM              {}
5517
5507
        | INSTALL_SYM           {}
5518
5508
        | NO_SYM                {}
5543
5533
        | ADDDATE_SYM              {}
5544
5534
        | AFTER_SYM                {}
5545
5535
        | AGGREGATE_SYM            {}
5546
 
        | ALGORITHM_SYM            {}
5547
5536
        | ANY_SYM                  {}
5548
5537
        | AT_SYM                   {}
5549
5538
        | AUTO_INC                 {}
5550
 
        | AUTOEXTEND_SIZE_SYM      {}
5551
5539
        | AVG_ROW_LENGTH           {}
5552
5540
        | AVG_SYM                  {}
5553
5541
        | BINLOG_SYM               {}
5591
5579
        | EXCLUSIVE_SYM            {}
5592
5580
        | EXTENDED_SYM             {}
5593
5581
        | EXTENT_SIZE_SYM          {}
5594
 
        | FAULTS_SYM               {}
5595
5582
        | FAST_SYM                 {}
5596
5583
        | FOUND_SYM                {}
5597
5584
        | ENABLE_SYM               {}
5607
5594
        | IDENTIFIED_SYM           {}
5608
5595
        | IMPORT                   {}
5609
5596
        | INDEXES                  {}
5610
 
        | INITIAL_SIZE_SYM         {}
5611
5597
        | ISOLATION                {}
5612
5598
        | INSERT_METHOD            {}
5613
5599
        | KEY_BLOCK_SIZE           {}
5614
5600
        | LAST_SYM                 {}
5615
 
        | LEAVES                   {}
5616
5601
        | LEVEL_SYM                {}
5617
 
        | LINESTRING               {}
5618
5602
        | LIST_SYM                 {}
5619
5603
        | LOCAL_SYM                {}
5620
5604
        | LOCKS_SYM                {}
5621
 
        | LOGFILE_SYM              {}
5622
5605
        | LOGS_SYM                 {}
5623
5606
        | MAX_ROWS                 {}
5624
5607
        | MAX_SIZE_SYM             {}
5712
5695
        | UNKNOWN_SYM              {}
5713
5696
        | UNTIL_SYM                {}
5714
5697
        | USER                     {}
5715
 
        | USE_FRM                  {}
5716
5698
        | VARIABLES                {}
5717
5699
        | VALUE_SYM                {}
5718
5700
        | WARNINGS                 {}