← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/memcached_stats/stats_table.cc

  • Committer: mordred
  • Date: 2010-04-20 00:00:46 UTC
  • mfrom: (1471.5.3 more-valgrind)
  • mto: This revision was merged to the branch mainline in revision 1498.
  • Revision ID: mordred@orisndriz09-20100420000046-263x5hazl0huw8u3
Merged in more-valgrind.

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;
43
44
 
44
45
extern "C"
45
46
memcached_return  server_function(const memcached_st *ptr,
46
 
                                  const memcached_server_st *server,
 
47
                                  memcached_server_st *server,
47
48
                                  void *context);
48
49
 
49
50
 
58
59
 
59
60
extern "C"
60
61
memcached_return  server_function(const memcached_st *memc,
61
 
                                  const memcached_server_st *server,
 
62
                                  memcached_server_st *server,
62
63
                                  void *context)
63
64
{
64
65
  server_function_context *ctx= static_cast<server_function_context *>(context);
65
66
 
66
 
  const char *server_name= memcached_server_name(server);
67
 
  in_port_t server_port= memcached_server_port(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,
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;