← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_parse.cc

  • Committer: Padraig O'Sullivan
  • Date: 2009-03-07 19:16:29 UTC
  • mfrom: (920 drizzle)
  • mto: (934.3.2 mordred)
  • mto: This revision was merged to the branch mainline in revision 938.
  • Revision ID: osullivan.padraig@gmail.com-20090307191629-fjdt66ccncs295kk
Merge from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_parse.cc
1648
1648
  case SQLCOM_LOAD:
1649
1649
  {
1650
1650
    assert(first_table == all_tables && first_table != 0);
1651
 
    if (lex->local_file)
1652
 
    {
1653
 
      if (!(session->client_capabilities & CLIENT_LOCAL_FILES) ||
1654
 
          !opt_local_infile)
1655
 
      {
1656
 
        my_message(ER_NOT_ALLOWED_COMMAND, ER(ER_NOT_ALLOWED_COMMAND), MYF(0));
1657
 
        goto error;
1658
 
      }
1659
 
    }
1660
 
 
1661
1651
    res= mysql_load(session, lex->exchange, first_table, lex->field_list,
1662
 
                    lex->update_list, lex->value_list, lex->duplicates,
1663
 
                    lex->ignore, (bool) lex->local_file);
 
1652
                    lex->update_list, lex->value_list, lex->duplicates, lex->ignore);
1664
1653
    break;
1665
1654
  }
1666
1655