← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to libdrizzleclient/drizzle.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/drizzle.c
301
301
    goto error;
302
302
  }
303
303
 
304
 
  if (my_net_init(net, net->vio))
 
304
  if (drizzleclient_net_init(net, net->vio))
305
305
  {
306
306
    vio_delete(net->vio);
307
307
    net->vio = 0;
312
312
 
313
313
  /* If user set read_timeout, let it override the default */
314
314
  if (drizzle->options.read_timeout)
315
 
    my_net_set_read_timeout(net, drizzle->options.read_timeout);
 
315
    drizzleclient_net_set_read_timeout(net, drizzle->options.read_timeout);
316
316
 
317
317
  /* If user set write_timeout, let it override the default */
318
318
  if (drizzle->options.write_timeout)
319
 
    my_net_set_write_timeout(net, drizzle->options.write_timeout);
 
319
    drizzleclient_net_set_write_timeout(net, drizzle->options.write_timeout);
320
320
 
321
321
  if (drizzle->options.max_allowed_packet)
322
322
    net->max_packet_size= drizzle->options.max_allowed_packet;
464
464
    db= 0;
465
465
  }
466
466
  /* Write authentication package */
467
 
  if (my_net_write(net, (unsigned char*) buff, (size_t) (end-buff)) || net_flush(net))
 
467
  if (drizzleclient_net_write(net, (unsigned char*) buff, (size_t) (end-buff)) || net_flush(net))
468
468
  {
469
469
    drizzle_set_extended_error(drizzle, CR_SERVER_LOST, sqlstate_get_unknown(),
470
470
                               ER(CR_SERVER_LOST_SEND_AUTH),