← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/drizzle_protocol/drizzle_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/drizzle_protocol/drizzle_protocol.cc
59
59
plugin::Client *ListenDrizzleProtocol::getClient(int fd)
60
60
{
61
61
  int new_fd= acceptTcp(fd);
62
 
  return new_fd == -1 ? NULL : new ClientDrizzleProtocol(new_fd, getCounters());
 
62
  return new_fd == -1 ? NULL : new ClientMySQLProtocol(new_fd, getCounters());
63
63
}
64
64
 
65
65
static int init(drizzled::module::Context &context)
66
66
{  
67
67
  const module::option_map &vm= context.getOptions();
68
68
 
69
 
  ListenDrizzleProtocol *protocol=new ListenDrizzleProtocol("drizzle_protocol", vm["bind-address"].as<std::string>(), true);
 
69
  ListenDrizzleProtocol *protocol=new ListenDrizzleProtocol("drizzle_protocol", vm["bind-address"].as<std::string>());
70
70
  protocol->addCountersToTable();
71
71
  context.add(protocol);
72
72
  context.registerVariable(new sys_var_constrained_value_readonly<in_port_t>("port", port));