← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/mysql_unix_socket_protocol/protocol.h

  • 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.h
34
34
class Protocol : public ListenMySQLProtocol
35
35
{
36
36
public:
37
 
  Protocol(std::string name, bool using_mysql41_protocol, const boost::filesystem::path &unix_socket_path) :
38
 
    ListenMySQLProtocol(name, unix_socket_path.file_string(), using_mysql41_protocol), 
 
37
  Protocol(std::string name, const boost::filesystem::path &unix_socket_path) :
 
38
    ListenMySQLProtocol(name, unix_socket_path.file_string()), 
39
39
    _unix_socket_path(unix_socket_path)
40
40
  { }
41
41
 
50
50
  const boost::filesystem::path _unix_socket_path;
51
51
};
52
52
 
53
 
class ClientMySQLUnixSocketProtocol : public ClientMySQLProtocol
54
 
{
55
 
public:
56
 
  ClientMySQLUnixSocketProtocol(int fd, bool __using_mysql41_protocol, ProtocolCounters& set_counters) : ClientMySQLProtocol(fd, __using_mysql41_protocol, set_counters) {}
57
 
};
58
 
 
59
 
 
60
53
} /* namespace mysql_unix_socket_protocol */
61
54
} /* namespace drizzle_plugin */
62
55