← 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-09-11 17:30:35 UTC
  • mto: (322.2.8 stdize-code)
  • mto: This revision was merged to the branch mainline in revision 386.
  • Revision ID: brian@tangent.org-20080911173035-vcdxoxxcmsp35q5q
Removed option for single command replication and have now left disable of
sql_log (more universal in nature).

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_yacc.yy
822
822
%token  UNDERSCORE_CHARSET
823
823
%token  UNDOFILE_SYM
824
824
%token  UNDO_SYM                      /* FUTURE-USE */
825
 
%token  UNINSTALL_SYM
826
825
%token  UNION_SYM                     /* SQL-2003-R */
827
826
%token  UNIQUE_SYM
828
827
%token  UNKNOWN_SYM                   /* SQL-2003-R */
857
856
%token  WITH_CUBE_SYM                 /* INTERNAL */
858
857
%token  WITH_ROLLUP_SYM               /* INTERNAL */
859
858
%token  WORK_SYM                      /* SQL-2003-N */
860
 
%token  WRAPPER_SYM
861
859
%token  WRITE_SYM                     /* SQL-2003-N */
862
860
%token  XOR
863
861
%token  YEAR_MONTH_SYM
902
900
%type <num>
903
901
        type int_type real_type order_dir
904
902
        if_exists opt_local opt_table_options table_options
905
 
        table_option opt_if_not_exists opt_no_write_to_binlog
 
903
        table_option opt_if_not_exists
906
904
        opt_temporary all_or_any opt_distinct
907
905
        union_option
908
906
        start_transaction_opts opt_chain opt_release
2319
2317
            lex->create_info.default_table_charset= NULL;
2320
2318
            lex->create_info.row_type= ROW_TYPE_NOT_USED;
2321
2319
            lex->alter_info.reset();
2322
 
            lex->no_write_to_binlog= 0;
2323
2320
            lex->alter_info.build_method= $2;
2324
2321
          }
2325
2322
          alter_commands
2670
2667
        ;
2671
2668
 
2672
2669
repair:
2673
 
          REPAIR opt_no_write_to_binlog table_or_tables
 
2670
          REPAIR table_or_tables
2674
2671
          {
2675
2672
            LEX *lex=Lex;
2676
2673
            lex->sql_command = SQLCOM_REPAIR;
2677
 
            lex->no_write_to_binlog= $2;
2678
2674
            lex->check_opt.init();
2679
2675
          }
2680
2676
          table_list opt_mi_repair_type
2698
2694
        ;
2699
2695
 
2700
2696
analyze:
2701
 
          ANALYZE_SYM opt_no_write_to_binlog table_or_tables
 
2697
          ANALYZE_SYM table_or_tables
2702
2698
          {
2703
2699
            LEX *lex=Lex;
2704
2700
            lex->sql_command = SQLCOM_ANALYZE;
2705
 
            lex->no_write_to_binlog= $2;
2706
2701
            lex->check_opt.init();
2707
2702
          }
2708
2703
          table_list
2749
2744
        ;
2750
2745
 
2751
2746
optimize:
2752
 
          OPTIMIZE opt_no_write_to_binlog table_or_tables
 
2747
          OPTIMIZE table_or_tables
2753
2748
          {
2754
2749
            LEX *lex=Lex;
2755
2750
            lex->sql_command = SQLCOM_OPTIMIZE;
2756
 
            lex->no_write_to_binlog= $2;
2757
2751
            lex->check_opt.init();
2758
2752
          }
2759
2753
          table_list
2760
2754
          {}
2761
2755
        ;
2762
2756
 
2763
 
opt_no_write_to_binlog:
2764
 
          /* empty */ { $$= 0; }
2765
 
        | NO_WRITE_TO_BINLOG { $$= 1; }
2766
 
        | LOCAL_SYM { $$= 1; }
2767
 
        ;
2768
 
 
2769
2757
rename:
2770
2758
          RENAME table_or_tables
2771
2759
          {
5471
5459
/* flush things */
5472
5460
 
5473
5461
flush:
5474
 
          FLUSH_SYM opt_no_write_to_binlog
 
5462
          FLUSH_SYM
5475
5463
          {
5476
5464
            LEX *lex=Lex;
5477
5465
            lex->sql_command= SQLCOM_FLUSH;
5478
5466
            lex->type= 0;
5479
 
            lex->no_write_to_binlog= $2;
5480
5467
          }
5481
5468
          flush_options
5482
5469
          {}
6213
6200
        | START_SYM             {}
6214
6201
        | STOP_SYM              {}
6215
6202
        | TRUNCATE_SYM          {}
6216
 
        | UNINSTALL_SYM         {}
6217
 
        | WRAPPER_SYM           {}
6218
6203
        | UPGRADE_SYM           {}
6219
6204
        ;
6220
6205