← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to sql/net_serv.cc

  • Committer: Stewart Smith
  • Date: 2008-06-30 06:25:49 UTC
  • mfrom: (12.3.1 drizzle-stew)
  • mto: This revision was merged to the branch mainline in revision 19.
  • Revision ID: stewart@flamingspork.com-20080630062549-js2qnn332yz28dp8
remove non-thread safe client library. client lib is now *always* thread safe.

Show diffs side-by-side

added added

removed removed

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