~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/memcached_stats/memcached_stats.cc

  • Committer: Lee Bieber
  • Date: 2010-12-15 16:23:36 UTC
  • mfrom: (1995.1.2 build)
  • Revision ID: kalebral@gmail.com-20101215162336-juntyt4gw4vgohg4
Merge Andrew - fix bug 628912: Crash / segfault in drizzled::Item_func::arguments (this=0x35) at ./drizzled/function/func.h
Merge Andrew - 663919: next query after KILL QUERY will error

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
1
/* 
2
 
 * Copyright (C) 2009, Padraig O'Sullivan
 
2
 * Copyright (c) 2009, Padraig O'Sullivan
3
3
 * All rights reserved.
4
4
 *
5
5
 * Redistribution and use in source and binary forms, with or without
84
84
{
85
85
  context("servers",
86
86
          po::value<std::string>()->default_value(""),
87
 
          _("List of memcached servers."));
 
87
          N_("List of memcached servers."));
88
88
}
89
89
 
90
90
} /* namespace drizzle_plugin */
98
98
  N_("Memcached Stats as I_S tables"),
99
99
  PLUGIN_LICENSE_BSD,
100
100
  drizzle_plugin::init,   /* Plugin Init      */
101
 
  NULL, /* depends */
 
101
  NULL, /* system variables */
102
102
  drizzle_plugin::init_options    /* config options   */
103
103
}
104
104
DRIZZLE_DECLARE_PLUGIN_END;