← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/mysql_unix_socket_protocol/protocol.cc

  • Committer: Mark Atwood
  • Date: 2011-06-14 19:30:31 UTC
  • mfrom: (2318.2.41 refactor5)
  • Revision ID: me@mark.atwood.name-20110614193031-lwbrlwfgf6id4r8b
merge lp:~olafvdspek/drizzle/refactor6
 with resolved conflict in drizzled/plugin/client.h

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/mysql_unix_socket_protocol/protocol.cc
67
67
  fs::path uds_path(vm["path"].as<fs::path>());
68
68
  if (not fs::exists(uds_path))
69
69
  {
70
 
    Protocol *listen_obj= new Protocol("mysql_unix_socket_protocol", true, uds_path);
 
70
    Protocol *listen_obj= new Protocol("mysql_unix_socket_protocol", uds_path);
71
71
    listen_obj->addCountersToTable();
72
72
    context.add(listen_obj);
73
73
    context.registerVariable(new sys_var_const_string_val("path", fs::system_complete(uds_path).file_string()));
148
148
plugin::Client *Protocol::getClient(int fd)
149
149
{
150
150
  int new_fd= acceptTcp(fd);
151
 
  return new_fd == -1 ? NULL : new ClientMySQLUnixSocketProtocol(new_fd, _using_mysql41_protocol, getCounters());
 
151
  return new_fd == -1 ? NULL : new ClientMySQLProtocol(new_fd, getCounters());
152
152
}
153
153
 
154
154
static void init_options(drizzled::module::option_context &context)