← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/oldlibdrizzle/net_serv.cc

  • Committer: Brian Aker
  • Date: 2009-10-12 17:25:41 UTC
  • mfrom: (1166.4.2 bug-436685)
  • Revision ID: brian@gaz-20091012172541-ta8k2ejioknnexab
Merge Diego Medina

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/oldlibdrizzle/net_serv.cc
526
526
    assert(pos);
527
527
    if ((long) (length= drizzleclient_vio_write(net->vio, pos, (size_t) (end-pos))) <= 0)
528
528
    {
 
529
     /**
 
530
       * We could end up here with net->vio == NULL
 
531
       * See LP bug#436685
 
532
       * If that is the case, we exit the while loop
 
533
       */
 
534
      if (net->vio == NULL)
 
535
        break;
 
536
      
529
537
      const bool interrupted= drizzleclient_vio_should_retry(net->vio);
530
538
      /*
531
539
        If we read 0, or we were interrupted this means that
606
614
      /* First read is done with non blocking mode */
607
615
      if ((long) (length= drizzleclient_vio_read(net->vio, pos, remain)) <= 0L)
608
616
      {
 
617
        if (net->vio == NULL)
 
618
          goto end;
 
619
 
609
620
        const bool interrupted = drizzleclient_vio_should_retry(net->vio);
610
621
 
611
622
        if (interrupted)