← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/drizzle_protocol/drizzle_protocol.h

  • Committer: Stewart Smith
  • Date: 2010-11-07 04:22:31 UTC
  • mto: (1911.1.2 build)
  • mto: This revision was merged to the branch mainline in revision 1912.
  • Revision ID: stewart@flamingspork.com-20101107042231-ola4sl7j0qvg58tz
https://launchpad.net/bugs/668880
fix ARCHIVE storage engine calling exit (lintian warning). Was because we were linking in libinternal into libazio, which links into archive plugin. Just link libinternal into the command line utilities.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/drizzle_protocol/drizzle_protocol.h
25
25
#include <drizzled/plugin/listen_tcp.h>
26
26
#include <drizzled/plugin/client.h>
27
27
#include <drizzled/atomics.h>
28
 
#include <drizzled/plugin/table_function.h>
29
 
 
30
 
#include <plugin/mysql_protocol/mysql_protocol.h>
31
 
 
32
 
namespace drizzle_plugin
33
 
{
 
28
#include "drizzled/plugin/table_function.h"
 
29
 
 
30
#include "plugin/mysql_protocol/mysql_protocol.h"
 
31
 
34
32
namespace drizzle_protocol
35
33
{
36
34
 
37
35
class ListenDrizzleProtocol: public ListenMySQLProtocol
38
36
{
39
37
public:
40
 
  ListenDrizzleProtocol(std::string name, 
41
 
                        const std::string &bind_address,
42
 
                        bool using_mysql41_protocol):
43
 
    ListenMySQLProtocol(name, bind_address, using_mysql41_protocol)
 
38
  ListenDrizzleProtocol(std::string name_arg, bool using_mysql41_protocol_arg):
 
39
    ListenMySQLProtocol(name_arg, using_mysql41_protocol_arg)
44
40
  { }
45
41
 
46
42
  ~ListenDrizzleProtocol();
 
43
 
 
44
  const char* getHost(void) const;
47
45
  in_port_t getPort(void) const;
48
 
  static ProtocolCounters *drizzle_counters;
49
 
  virtual ProtocolCounters *getCounters(void) const { return drizzle_counters; }
50
 
  drizzled::plugin::Client *getClient(int fd);
51
 
};
52
 
 
53
 
class ClientDrizzleProtocol: public ClientMySQLProtocol
54
 
{
55
 
public:
56
 
  ClientDrizzleProtocol(int fd, ProtocolCounters *set_counters): ClientMySQLProtocol(fd, true, set_counters) {}
57
 
 
58
 
  static std::vector<std::string> drizzle_admin_ip_addresses;
59
 
  static void drizzle_compose_ip_addresses(std::vector<std::string> options);
60
 
  bool isAdminAllowed(void);
61
 
};
 
46
};
 
47
 
62
48
 
63
49
} /* namespace drizzle_protocol */
64
 
} /* namespace drizzle_plugin */
65
 
 
 
50
 
66
51
#endif /* PLUGIN_DRIZZLE_PROTOCOL_DRIZZLE_PROTOCOL_H */