← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/oldlibdrizzle/viosocket.cc

  • Committer: Stewart Smith
  • Date: 2009-08-20 17:15:54 UTC
  • mto: (1119.2.2 merge)
  • mto: This revision was merged to the branch mainline in revision 1124.
  • Revision ID: stewart@flamingspork.com-20090820171554-72eo1tqlc4n64rak
Valgrind 3.5 requires --alignment to be a power of 2 between 16 and 4096. The specifying --alignment is not important for us, so remove it.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/oldlibdrizzle/viosocket.cc
21
21
*/
22
22
 
23
23
#define DONT_MAP_VIO
24
 
#include "config.h"
 
24
#include <drizzled/global.h>
25
25
#include "vio.h"
26
26
#include <drizzled/util/test.h>
27
27
 
28
28
#include <sys/socket.h>
29
 
#include <fcntl.h>
 
29
#include <string.h>
30
30
 
31
 
#include <sys/types.h>
32
31
#include <netinet/tcp.h>
33
32
#include <netinet/in.h>
34
33
#include <sys/poll.h>
35
 
#include <unistd.h>
36
34
 
37
35
#include <netdb.h>
38
36
 
39
 
#include <cstdio>
40
 
#include <cstring>
41
 
#include <cassert>
42
 
 
43
37
#include <algorithm>
44
38
 
45
39
using namespace std;
46
40
 
47
 
namespace drizzle_protocol
48
 
{
49
 
 
50
 
 
51
41
int drizzleclient_vio_errno(Vio *vio)
52
42
{
53
43
  (void)vio;
123
113
{
124
114
  int r=0;
125
115
 
126
 
  *old_mode= drizzled::test(!(vio->fcntl_mode & O_NONBLOCK));
 
116
  *old_mode= test(!(vio->fcntl_mode & O_NONBLOCK));
127
117
 
128
118
  if (vio->sd >= 0)
129
119
  {
320
310
    assert(error == 0);
321
311
  }
322
312
}
323
 
 
324
 
} /* namespace drizzle_protcol */