← 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: Jay Pipes
  • Date: 2010-04-08 16:27:25 UTC
  • mfrom: (1405.6.10 replication-pairs)
  • mto: This revision was merged to the branch mainline in revision 1457.
  • Revision ID: jpipes@serialcoder-20100408162725-sugbgn38oxjqclq2
Merge trunk and replication-pairs with conflict resolution

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/memcached_stats/stats_table.cc
43
43
 
44
44
extern "C"
45
45
memcached_return  server_function(const memcached_st *ptr,
46
 
                                  memcached_server_st *server,
 
46
                                  const memcached_server_st *server,
47
47
                                  void *context);
48
48
 
49
49
 
58
58
 
59
59
extern "C"
60
60
memcached_return  server_function(const memcached_st *memc,
61
 
                                  memcached_server_st *server,
 
61
                                  const memcached_server_st *server,
62
62
                                  void *context)
63
63
{
64
64
  server_function_context *ctx= static_cast<server_function_context *>(context);
65
65
 
66
 
  char *server_name= memcached_server_name(memc, *server);
67
 
  in_port_t server_port= memcached_server_port(memc, *server);
 
66
  const char *server_name= memcached_server_name(server);
 
67
  in_port_t server_port= memcached_server_port(server);
68
68
 
69
69
  memcached_stat_st stats;
70
70
  memcached_return ret= memcached_stat_servername(&stats, NULL,