← 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: Lee Bieber
  • Date: 2011-03-29 22:31:41 UTC
  • mfrom: (2257.1.3 build)
  • Revision ID: kalebral@gmail.com-20110329223141-yxc22h3l2he58sk0
Merge Andrew - 743842: Build failure using GCC 4.6
Merge Stewart - 738022: CachedDirectory silently fails to add entries if stat() fails
Merge Olaf - Common fwd: add copyright, add more declaration

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/drizzle_protocol/drizzle_protocol.cc
19
19
 */
20
20
 
21
21
 
22
 
#include "config.h"
 
22
#include <config.h>
23
23
#include <drizzled/gettext.h>
24
24
#include <drizzled/error.h>
25
25
#include <drizzled/query_id.h>
26
 
#include <drizzled/sql_state.h>
27
26
#include <drizzled/session.h>
28
 
#include "drizzled/internal/my_sys.h"
29
 
#include "drizzled/internal/m_string.h"
 
27
#include <drizzled/internal/my_sys.h>
 
28
#include <drizzled/internal/m_string.h>
30
29
#include <algorithm>
31
30
#include <iostream>
32
31
#include <boost/program_options.hpp>
33
32
#include <drizzled/module/option_map.h>
34
 
#include "drizzled/util/tokenize.h"
 
33
#include <drizzled/util/tokenize.h>
35
34
#include "drizzle_protocol.h"
36
 
#include "plugin/drizzle_protocol/status_table.h"
37
35
 
38
36
namespace po= boost::program_options;
39
37
using namespace drizzled;
97
95
{  
98
96
  const module::option_map &vm= context.getOptions();
99
97
 
100
 
  context.add(new StatusTable);
101
 
  context.add(new ListenDrizzleProtocol("drizzle_protocol", vm["bind-address"].as<std::string>(), true));
 
98
  ListenDrizzleProtocol *protocol=new ListenDrizzleProtocol("drizzle_protocol", vm["bind-address"].as<std::string>(), true);
 
99
  protocol->addCountersToTable();
 
100
  context.add(protocol);
102
101
  context.registerVariable(new sys_var_constrained_value_readonly<in_port_t>("port", port));
103
102
  context.registerVariable(new sys_var_constrained_value_readonly<uint32_t>("connect_timeout", connect_timeout));
104
103
  context.registerVariable(new sys_var_constrained_value_readonly<uint32_t>("read_timeout", read_timeout));
135
134
          po::value<buffer_constraint>(&buffer_length)->default_value(16384),
136
135
          N_("Buffer length."));
137
136
  context("bind-address",
138
 
          po::value<std::string>()->default_value(""),
 
137
          po::value<std::string>()->default_value("localhost"),
139
138
          N_("Address to bind to."));
140
139
  context("max-connections",
141
140
          po::value<uint32_t>(&ListenDrizzleProtocol::drizzle_counters->max_connections)->default_value(1000),