← 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-03-07 17:21:24 UTC
  • mfrom: (919.1.3 merge)
  • Revision ID: brian@tangent.org-20090307172124-s1bnv3chifan0v5s
Merge of patches for removal of LOAD DATA "LOCAL"

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_yacc.yy
924
924
 
925
925
%type <num>
926
926
        type int_type real_type order_dir field_def
927
 
        if_exists opt_local opt_table_options table_options
 
927
        if_exists opt_table_options table_options
928
928
        table_option opt_if_not_exists
929
929
        opt_temporary all_or_any opt_distinct
930
930
        union_option
5166
5166
 
5167
5167
            lex->fname_start= lip->get_ptr();
5168
5168
          }
5169
 
          load_data_lock opt_local INFILE TEXT_STRING_filesystem
 
5169
          load_data_lock INFILE TEXT_STRING_filesystem
5170
5170
          {
5171
5171
            LEX *lex=Lex;
5172
5172
            lex->sql_command= SQLCOM_LOAD;
5173
5173
            lex->lock_option= $4;
5174
 
            lex->local_file=  $5;
5175
5174
            lex->duplicates= DUP_ERROR;
5176
5175
            lex->ignore= 0;
5177
 
            if (!(lex->exchange= new file_exchange($7.str, 0, $2)))
 
5176
            if (!(lex->exchange= new file_exchange($6.str, 0, $2)))
5178
5177
              DRIZZLE_YYABORT;
5179
5178
          }
5180
5179
          opt_duplicate INTO
5187
5186
          TABLE_SYM table_ident
5188
5187
          {
5189
5188
            LEX *lex=Lex;
5190
 
            if (!Select->add_table_to_list(YYSession, $13, NULL, TL_OPTION_UPDATING,
 
5189
            if (!Select->add_table_to_list(YYSession, $12, NULL, TL_OPTION_UPDATING,
5191
5190
                                           lex->lock_option))
5192
5191
              DRIZZLE_YYABORT;
5193
5192
            lex->field_list.empty();
5202
5201
data_file:
5203
5202
        DATA_SYM  { $$= FILETYPE_CSV; };
5204
5203
 
5205
 
opt_local:
5206
 
          /* empty */ { $$=0;}
5207
 
        | LOCAL_SYM { $$=1;}
5208
 
        ;
5209
 
 
5210
5204
load_data_lock:
5211
5205
          /* empty */ { $$= TL_WRITE_DEFAULT; }
5212
5206
        | CONCURRENT