← 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-05-15 07:40:30 UTC
  • mfrom: (1019.1.7 merge)
  • Revision ID: brian@gaz-20090515074030-che1sh7nqadhyj45
Code / Style cleanup merge.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_yacc.yy
351
351
  List<String> *string_list;
352
352
  String *string;
353
353
  Key_part_spec *key_part;
 
354
  Function_builder *udf;
354
355
  TableList *table_list;
355
 
  Function_builder *udf;
356
 
  LEX_USER *lex_user;
357
356
  struct sys_var_with_base variable;
358
357
  enum enum_var_type var_type;
359
358
  Key::Keytype key_type;
372
371
  enum enum_drizzle_timestamp_type date_time_type;
373
372
  Select_Lex *select_lex;
374
373
  chooser_compare_func_creator boolfunc2creator;
375
 
  struct sp_cond_type *spcondtype;
376
374
  struct { int vars, conds, hndlrs, curs; } spblock;
377
375
  struct st_lex *lex;
378
376
  struct p_elem_val *p_elem_value;
686
684
%token  PAGE_SYM
687
685
%token  PAGE_CHECKSUM_SYM
688
686
%token  PARAM_MARKER
689
 
%token  PARSE_VCOL_EXPR_SYM
690
687
%token  PARTIAL                       /* SQL-2003-N */
691
688
%token  PHASE_SYM
692
 
%token  PLUGINS_SYM
693
 
%token  PLUGIN_SYM
694
689
%token  POINT_SYM
695
690
%token  PORT_SYM
696
691
%token  POSITION_SYM                  /* SQL-2003-N */
715
710
%token  REDO_BUFFER_SIZE_SYM
716
711
%token  REDUNDANT_SYM
717
712
%token  REFERENCES                    /* SQL-2003-R */
718
 
%token  RELAY_LOG_FILE_SYM
719
 
%token  RELAY_LOG_POS_SYM
720
 
%token  RELAY_THREAD
721
713
%token  RELEASE_SYM                   /* SQL-2003-R */
722
714
%token  RELOAD
723
715
%token  REMOVE_SYM
762
754
%token  SHOW
763
755
%token  SHUTDOWN
764
756
%token  SIMPLE_SYM                    /* SQL-2003-N */
765
 
%token  SLAVE
766
757
%token  SNAPSHOT_SYM
767
758
%token  SOCKET_SYM
768
759
%token  SONAME_SYM
1586
1577
            lex->comment=null_lex_str;
1587
1578
            lex->charset=NULL;
1588
1579
            lex->column_format= COLUMN_FORMAT_TYPE_DEFAULT;
1589
 
            lex->vcol_info= NULL;
1590
1580
          }
1591
1581
          field_def
1592
1582
          {
2194
2184
            lex->charset= NULL;
2195
2185
            lex->alter_info.flags|= ALTER_CHANGE_COLUMN;
2196
2186
            lex->column_format= COLUMN_FORMAT_TYPE_DEFAULT;
2197
 
            lex->vcol_info= NULL;
2198
2187
          }
2199
2188
          field_def
2200
2189
          {
5531
5520
        | SECURITY_SYM          {}
5532
5521
        | SERVER_SYM            {}
5533
5522
        | SOCKET_SYM            {}
5534
 
        | SLAVE                 {}
5535
5523
        | SONAME_SYM            {}
5536
5524
        | START_SYM             {}
5537
5525
        | STOP_SYM              {}
5659
5647
        | PAGE_CHECKSUM_SYM        {}
5660
5648
        | PARTIAL                  {}
5661
5649
        | PHASE_SYM                {}
5662
 
        | PLUGIN_SYM               {}
5663
 
        | PLUGINS_SYM              {}
5664
5650
        | POINT_SYM                {}
5665
5651
        | PREV_SYM                 {}
5666
5652
        | PROCESS                  {}
5674
5660
        | REDO_BUFFER_SIZE_SYM     {}
5675
5661
        | REDOFILE_SYM             {}
5676
5662
        | REDUNDANT_SYM            {}
5677
 
        | RELAY_LOG_FILE_SYM       {}
5678
 
        | RELAY_LOG_POS_SYM        {}
5679
 
        | RELAY_THREAD             {}
5680
5663
        | RELOAD                   {}
5681
5664
        | REORGANIZE_SYM           {}
5682
5665
        | REPEATABLE_SYM           {}