← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/drizzled.cc

Further drizzleclient cleanup. Starting to move all NET related functions into Protocol, removed some dead code, removing drizzleclient dependencies spread throughout drizzled.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/drizzled.cc
28
28
#include <signal.h>
29
29
 
30
30
#include <mysys/my_bit.h>
31
 
#include <libdrizzleclient/libdrizzle.h>
32
31
#include <mysys/hash.h>
33
32
#include <drizzled/stacktrace.h>
34
33
#include <mysys/mysys_err.h>
64
63
#include <sys/prctl.h>
65
64
#endif
66
65
 
67
 
#include <libdrizzleclient/errmsg.h>
68
66
#include <locale.h>
69
67
 
70
68
#define mysqld_charset &my_charset_utf8_general_ci
1966
1964
      close(new_sock);
1967
1965
      continue;
1968
1966
    }
1969
 
    if (drizzleclient_net_init_sock(&session->net, new_sock, sock == 0))
 
1967
 
 
1968
    if (session->protocol->init_file_descriptor(new_sock))
1970
1969
    {
1971
1970
      delete session;
1972
1971
      continue;