← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to libdrizzle/net_serv.c

Giant merge.

Show diffs side-by-side

added added

removed removed

Lines of Context:
libdrizzle/net_serv.c
17
17
  HFTODO this must be hidden if we don't want client capabilities in 
18
18
  embedded library
19
19
 */
20
 
#include <my_global.h>
 
20
#include <drizzled/global.h>
21
21
#include <drizzle.h>
22
 
#include <drizzle_com.h>
23
 
#include <mysqld_error.h>
24
 
#include <my_sys.h>
25
 
#include <m_string.h>
26
 
#include <my_net.h>
27
 
#include <violite.h>
 
22
#include <drizzled/error.h>
 
23
#include <mysys/my_sys.h>
 
24
#include <mystrings/m_string.h>
 
25
#include <vio/violite.h>
28
26
#include <signal.h>
29
27
#include <errno.h>
 
28
#include <sys/poll.h>
30
29
 
31
30
/*
32
31
  The following handles the differences when this is linked between the
40
39
 
41
40
#define DONT_USE_THR_ALARM
42
41
 
43
 
#include "thr_alarm.h"
 
42
#include <mysys/thr_alarm.h>
44
43
 
45
44
 
46
45
#define update_statistics(A)
546
545
                  NET_HEADER_SIZE);
547
546
  /* Backup of the original SO_RCVTIMEO timeout */
548
547
  struct timeval backtime;
549
 
  int error;
 
548
  int error= 0;
550
549
 
551
550
  *complen = 0;
552
551