~maria-developers/maria/wlad-5.5-threadpool

« back to all changes in this revision

Viewing changes to sql/net_serv.cc

  • Committer: Vladislav Vaintroub
  • Date: 2011-12-05 00:44:37 UTC
  • Revision ID: wlad@montyprogram.com-20111205004437-rd5lqj1xue714j8q
fix compilation on Windows

Show diffs side-by-side

added added

removed removed

Lines of Context:
834
834
 
835
835
          DBUG_PRINT("info",("vio_read returned %ld  errno: %d",
836
836
                             (long) length, vio_errno(net->vio)));
837
 
#if !defined(__WIN__) || defined(MYSQL_SERVER)
 
837
#if !defined(__WIN__) && defined(MYSQL_SERVER)
838
838
          /*
839
839
            We got an error that there was no data on the socket. We now set up
840
840
            an alarm to not 'read forever', change the socket to non blocking
870
870
              continue;
871
871
            }
872
872
          }
873
 
#endif /* (!defined(__WIN__) || defined(MYSQL_SERVER) */
 
873
#endif /* (!defined(__WIN__) && defined(MYSQL_SERVER) */
874
874
          if (thr_alarm_in_use(&alarmed) && !thr_got_alarm(&alarmed) &&
875
875
              interrupted)
876
876
          {                                     /* Probably in MIT threads */