← 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: Eric Day
  • Date: 2010-03-25 19:28:37 UTC
  • mfrom: (1405 staging)
  • mto: This revision was merged to the branch mainline in revision 1409.
  • Revision ID: eday@oddments.org-20100325192837-4exmacbrywjovsqp
Merged trunk, rsolved conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/memcached_stats/stats_table.cc
80
80
  char **ptr= NULL;
81
81
 
82
82
  ctx->generator->push(server_name);
83
 
  ctx->generator->push(server_port);
 
83
  ctx->generator->push(static_cast<uint64_t>(server_port));
84
84
 
85
85
  for (ptr= list; *ptr; ptr++)
86
86
  {