← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to libdrizzleclient/drizzle.c

  • 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:
libdrizzleclient/drizzle.c
28
28
#include "drizzle.h"
29
29
#include "net_serv.h"
30
30
#include "drizzle_data.h"
31
 
#include "local_infile.h"
32
31
 
33
32
#include <drizzled/gettext.h>
34
33
 
669
668
  if ((length = drizzleclient_cli_safe_read(drizzle)) == packet_error)
670
669
    return(1);
671
670
  drizzleclient_free_old_query(drizzle);    /* Free old result */
672
 
get_info:
 
671
 
673
672
  pos=(unsigned char*) drizzle->net.read_pos;
674
673
  if ((field_count= drizzleclient_net_field_length(&pos)) == 0)
675
674
  {
681
680
 
682
681
    if (pos < drizzle->net.read_pos+length && drizzleclient_net_field_length(&pos))
683
682
      drizzle->info=(char*) pos;
684
 
    return(0);
 
683
    return 0;
685
684
  }
686
685
  if (field_count == NULL_LENGTH)    /* LOAD DATA LOCAL INFILE */
687
686
  {
688
 
    int error;
689
 
 
690
 
    if (!(drizzle->options.client_flag & CLIENT_LOCAL_FILES))
691
 
    {
692
 
      drizzleclient_set_error(drizzle, CR_MALFORMED_PACKET, drizzleclient_sqlstate_get_unknown());
693
 
      return(1);
694
 
    }
695
 
 
696
 
    error= drizzleclient_handle_local_infile(drizzle,(char*) pos);
697
 
    if ((length= drizzleclient_cli_safe_read(drizzle)) == packet_error || error)
698
 
      return(1);
699
 
    goto get_info;        /* Get info packet */
 
687
    drizzleclient_set_error(drizzle, CR_MALFORMED_PACKET, drizzleclient_sqlstate_get_unknown());
 
688
 
 
689
    return 1;
700
690
  }
701
691
  if (!(drizzle->server_status & SERVER_STATUS_AUTOCOMMIT))
702
692
    drizzle->server_status|= SERVER_STATUS_IN_TRANS;