← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to sql/net_serv.cc

More cleanup, this time libmysql_r goes to the bitbucket

Show diffs side-by-side

added added

removed removed

Lines of Context:
sql/net_serv.cc
594
594
                  my_progname);
595
595
#endif /* EXTRA_DEBUG */
596
596
      }
597
 
#if defined(THREAD_SAFE_CLIENT) && !defined(MYSQL_SERVER)
 
597
#if !defined(MYSQL_SERVER)
598
598
      if (vio_errno(net->vio) == SOCKET_EINTR)
599
599
      {
600
600
        DBUG_PRINT("warning",("Interrupted write. Retrying..."));
601
601
        continue;
602
602
      }
603
 
#endif /* defined(THREAD_SAFE_CLIENT) && !defined(MYSQL_SERVER) */
 
603
#endif /* !defined(MYSQL_SERVER) */
604
604
      net->error= 2;                            /* Close socket */
605
605
      net->last_errno= (interrupted ? ER_NET_WRITE_INTERRUPTED :
606
606
                               ER_NET_ERROR_ON_WRITE);
801
801
                    my_progname,vio_errno(net->vio));
802
802
#endif /* EXTRA_DEBUG */
803
803
          }
804
 
#if defined(THREAD_SAFE_CLIENT) && !defined(MYSQL_SERVER)
 
804
#if !defined(MYSQL_SERVER)
805
805
          if (vio_errno(net->vio) == SOCKET_EINTR)
806
806
          {
807
807
            DBUG_PRINT("warning",("Interrupted read. Retrying..."));