← Back to branch summary

~posulliv/drizzle/optimizer-style-cleanup

« back to all changes in this revision

Viewing changes to plugin/memcached_stats/stats_table.cc

  • Committer: Padraig O'Sullivan
  • Date: 2010-04-17 01:38:47 UTC
  • mfrom: (1237.9.238 bad-staging)
  • Revision ID: osullivan.padraig@gmail.com-20100417013847-ibjioqsfbmf5yg4g
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/memcached_stats/stats_table.cc
33
33
#include "sysvar_holder.h"
34
34
 
35
35
#include "drizzled/error.h"
 
36
#include <libmemcached/server.h>
36
37
 
37
38
using namespace std;
38
39
using namespace drizzled;
63
64
{
64
65
  server_function_context *ctx= static_cast<server_function_context *>(context);
65
66
 
66
 
  char *server_name= memcached_server_name(memc, *server);
67
 
  in_port_t server_port= memcached_server_port(memc, *server);
 
67
  const char *server_name= memcached_server_name(*memc, *server);
 
68
  in_port_t server_port= memcached_server_port(*memc, *server);
68
69
 
69
70
  memcached_stat_st stats;
70
71
  memcached_return ret= memcached_stat_servername(&stats, NULL,
80
81
  char **ptr= NULL;
81
82
 
82
83
  ctx->generator->push(server_name);
83
 
  ctx->generator->push(server_port);
 
84
  ctx->generator->push(static_cast<uint64_t>(server_port));
84
85
 
85
86
  for (ptr= list; *ptr; ptr++)
86
87
  {
184
185
 
185
186
  server_function_context context(this);
186
187
 
187
 
  memcached_server_fn callbacks[1];
 
188
  memcached_server_function callbacks[1];
188
189
  callbacks[0]= server_function;
189
190
 
190
191
  unsigned int iferror;