← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/memcached_functions/memc_stats.h

  • Committer: Monty Taylor
  • Date: 2009-10-16 19:52:26 UTC
  • mto: (1166.5.3 memcached_functions)
  • mto: This revision was merged to the branch mainline in revision 1189.
  • Revision ID: mordred@inaugust.com-20091016195226-h1j34f6z3u4kt0xf
Fixed merge-related errors, including libmemcached detection and header issues caught by cpplint.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/memcached_functions/memc_stats.h
29
29
 * THE POSSIBILITY OF SUCH DAMAGE.
30
30
 */
31
31
 
32
 
#ifndef DRIZZLE_PLUGIN_MEMCACHED_FUNCTIONS_MEMC_STATS_H
33
 
#define DRIZZLE_PLUGIN_MEMCACHED_FUNCTIONS_MEMC_STATS_H
 
32
#ifndef PLUGIN_MEMCACHED_FUNCTIONS_MEMC_STATS_H
 
33
#define PLUGIN_MEMCACHED_FUNCTIONS_MEMC_STATS_H
34
34
 
35
35
#include <drizzled/server_includes.h>
36
36
#include <drizzled/item/func.h>
37
37
 
38
38
#include <libmemcached/memcached.h>
39
39
 
40
 
#include <map>
41
 
#include <string>
42
 
 
43
40
/* implements memc_stats */
44
41
class MemcachedStats: public Item_str_func
45
42
{
71
68
  String results_buff;
72
69
};
73
70
 
74
 
#endif /* MEMC_STATS_H */
 
71
#endif /* PLUGIN_MEMCACHED_FUNCTIONS_MEMC_STATS_H */