← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_yacc.yy

Merge Stewart.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_yacc.yy
715
715
%token  REMOVE_SYM
716
716
%token  RENAME
717
717
%token  REORGANIZE_SYM
718
 
%token  REPAIR
719
718
%token  REPEATABLE_SYM                /* SQL-2003-N */
720
719
%token  REPEAT_SYM                    /* MYSQL-FUNC */
721
720
%token  REPLACE                       /* MYSQL-FUNC */
993
992
        insert_values update delete truncate rename
994
993
        show describe load alter optimize keycache flush
995
994
        begin commit rollback savepoint release
996
 
        repair analyze check start checksum
 
995
        analyze check start checksum
997
996
        field_list field_list_item field_spec kill column_def key_def
998
997
        keycache_list assign_to_keycache
999
998
        select_item_list select_item values_list no_braces
1092
1091
        | keycache
1093
1092
        | release
1094
1093
        | rename
1095
 
        | repair
1096
1094
        | replace
1097
1095
        | rollback
1098
1096
        | savepoint
2352
2350
        | EXTENDED_SYM  { Lex->check_opt.flags= T_EXTEND; }
2353
2351
        ;
2354
2352
 
2355
 
repair:
2356
 
          REPAIR table_or_tables
2357
 
          {
2358
 
            LEX *lex=Lex;
2359
 
            lex->sql_command = SQLCOM_REPAIR;
2360
 
            lex->check_opt.init();
2361
 
          }
2362
 
          table_list opt_mi_repair_type
2363
 
          {}
2364
 
        ;
2365
 
 
2366
 
opt_mi_repair_type:
2367
 
          /* empty */ { Lex->check_opt.flags = T_MEDIUM; }
2368
 
        | mi_repair_types {}
2369
 
        ;
2370
 
 
2371
 
mi_repair_types:
2372
 
          mi_repair_type {}
2373
 
        | mi_repair_type mi_repair_types {}
2374
 
        ;
2375
 
 
2376
 
mi_repair_type:
2377
 
          QUICK        { Lex->check_opt.flags|= T_QUICK; }
2378
 
        | EXTENDED_SYM { Lex->check_opt.flags|= T_EXTEND; }
2379
 
        | USE_FRM      { Lex->check_opt.use_frm= true; }
2380
 
        ;
2381
2353
 
2382
2354
analyze:
2383
2355
          ANALYZE_SYM table_or_tables
5497
5469
        | OPTIONS_SYM           {}
5498
5470
        | PORT_SYM              {}
5499
5471
        | REMOVE_SYM            {}
5500
 
        | REPAIR                {}
5501
5472
        | RESET_SYM             {}
5502
5473
        | ROLLBACK_SYM          {}
5503
5474
        | SAVEPOINT_SYM         {}