← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_yacc.yy

  • Committer: Lee Bieber
  • Date: 2011-04-14 19:29:43 UTC
  • mfrom: (2278.1.2 build)
  • Revision ID: kalebral@gmail.com-20110414192943-q1nxcdqupal0anjb
Merge Olaf - Refactor Table Cache
Merge Olaf - Delete unused functions

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_yacc.yy
4157
4157
          OUTFILE TEXT_STRING_filesystem
4158
4158
          {
4159
4159
            Lex.setCacheable(false);
4160
 
            if (!(Lex.exchange= new file_exchange($2.str, 0)) ||
4161
 
                !(Lex.result= new select_export(Lex.exchange)))
4162
 
              DRIZZLE_YYABORT;
 
4160
            Lex.exchange= new file_exchange($2.str, 0);
 
4161
            Lex.result= new select_export(Lex.exchange);
4163
4162
          }
4164
4163
          opt_field_term opt_line_term
4165
4164
        | DUMPFILE TEXT_STRING_filesystem
4167
4166
            if (not Lex.describe)
4168
4167
            {
4169
4168
              Lex.setCacheable(false);
4170
 
              if (not (Lex.exchange= new file_exchange($2.str,1)))
4171
 
                DRIZZLE_YYABORT;
4172
 
              if (not (Lex.result= new select_dump(Lex.exchange)))
4173
 
                DRIZZLE_YYABORT;
 
4169
              Lex.exchange= new file_exchange($2.str,1);
 
4170
              Lex.result= new select_dump(Lex.exchange);
4174
4171
            }
4175
4172
          }
4176
4173
        | select_var_list_init
4768
4765
            Lex.lock_option= $4;
4769
4766
            Lex.duplicates= DUP_ERROR;
4770
4767
            Lex.ignore= 0;
4771
 
            if (not (Lex.exchange= new file_exchange($6.str, 0, $2)))
4772
 
              DRIZZLE_YYABORT;
 
4768
            Lex.exchange= new file_exchange($6.str, 0, $2);
4773
4769
          }
4774
4770
          opt_duplicate INTO
4775
4771
          {