← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_yacc.yy

Removed load xml infile. Hope nobody liked it. Now the only thing we need xml.c
for anymore is charsets... so when _those_ go away... BWAHAHAHA

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_yacc.yy
860
860
%token  WORK_SYM                      /* SQL-2003-N */
861
861
%token  WRAPPER_SYM
862
862
%token  WRITE_SYM                     /* SQL-2003-N */
863
 
%token  XML_SYM
864
863
%token  XOR
865
864
%token  YEAR_MONTH_SYM
866
865
%token  YEAR_SYM                      /* SQL-2003-R */
1052
1051
 
1053
1052
%type <index_hint> index_hint_type
1054
1053
%type <num> index_hint_clause
1055
 
%type <filetype> data_or_xml
 
1054
%type <filetype> data_file
1056
1055
 
1057
1056
%type <NONE>
1058
1057
        '-' '+' '*' '/' '%' '(' ')'
5691
5690
/* import, export of files */
5692
5691
 
5693
5692
load:
5694
 
          LOAD data_or_xml
 
5693
          LOAD data_file
5695
5694
          {
5696
5695
            THD *thd= YYTHD;
5697
5696
            LEX *lex= thd->lex;
5729
5728
          }
5730
5729
          opt_load_data_charset
5731
5730
          { Lex->exchange->cs= $15; }
5732
 
          opt_xml_rows_identified_by
5733
5731
          opt_field_term opt_line_term opt_ignore_lines opt_field_or_var_spec
5734
5732
          opt_load_data_set_spec
5735
5733
          {}
5736
5734
        ;
5737
5735
 
5738
 
data_or_xml:
5739
 
        DATA_SYM  { $$= FILETYPE_CSV; }
5740
 
        | XML_SYM { $$= FILETYPE_XML; }
5741
 
        ;
 
5736
data_file:
 
5737
        DATA_SYM  { $$= FILETYPE_CSV; };
5742
5738
 
5743
5739
opt_local:
5744
5740
          /* empty */ { $$=0;}
5818
5814
          }
5819
5815
        ;
5820
5816
 
5821
 
opt_xml_rows_identified_by:
5822
 
        /* empty */ { }
5823
 
        | ROWS_SYM IDENTIFIED_SYM BY text_string
5824
 
          { Lex->exchange->line_term = $4; };
5825
 
 
5826
5817
opt_ignore_lines:
5827
5818
          /* empty */
5828
5819
        | IGNORE_SYM NUM lines_or_rows
6542
6533
        | WEEK_SYM                 {}
6543
6534
        | WEIGHT_STRING_SYM        {}
6544
6535
        | WORK_SYM                 {}
6545
 
        | XML_SYM                  {}
6546
6536
        | YEAR_SYM                 {}
6547
6537
        ;
6548
6538