← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to libdrizzleclient/local_infile.c

  • Committer: Monty Taylor
  • Date: 2009-02-08 10:59:43 UTC
  • mto: This revision was merged to the branch mainline in revision 852.
  • Revision ID: mordred@inaugust.com-20090208105943-e30tagctq2nrghxi
Renamed my_net_* to drizzleclient_net_* to help with namespace issues.

Show diffs side-by-side

added added

removed removed

Lines of Context:
libdrizzleclient/local_infile.c
89
89
  if ((*options->local_infile_init)(&li_ptr, net_filename,
90
90
    options->local_infile_userdata))
91
91
  {
92
 
    (void)my_net_write(net,(const unsigned char*) "",0); /* Server needs one packet */
 
92
    (void)drizzleclient_net_write(net,(const unsigned char*) "",0); /* Server needs one packet */
93
93
    net_flush(net);
94
94
    strcpy(net->sqlstate, sqlstate_get_unknown());
95
95
    net->last_errno=
104
104
    (*options->local_infile_read)(li_ptr, buf,
105
105
          packet_length)) > 0)
106
106
  {
107
 
    if (my_net_write(net, (unsigned char*) buf, readcount))
 
107
    if (drizzleclient_net_write(net, (unsigned char*) buf, readcount))
108
108
    {
109
109
      goto err;
110
110
    }
111
111
  }
112
112
 
113
113
  /* Send empty packet to mark end of file */
114
 
  if (my_net_write(net, (const unsigned char*) "", 0) || net_flush(net))
 
114
  if (drizzleclient_net_write(net, (const unsigned char*) "", 0) || net_flush(net))
115
115
  {
116
116
    drizzle_set_error(drizzle, CR_SERVER_LOST, sqlstate_get_unknown());
117
117
    goto err;