← Back to branch summary

~drizzle-trunk/drizzle/development

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/memcached_stats/plugin.ini

Committer: Jay Pipes
Date: 2010-02-23 18:09:22 UTC
mfrom: (1306 staging)
mto: (1273.21.1 split-xa-resource-manager)
mto: This revision was merged to the branch mainline in revision 1310.
Revision ID: jpipes@serialcoder-20100223180922-3km9cuep97eznug0

Merge trunk and fix conflicts.

files modified:
plugin/memcached_stats/analysis_table.cc

plugin/memcached_stats/analysis_table.h

plugin/memcached_stats/memcached_stats.cc

plugin/memcached_stats/plugin.ini

plugin/memcached_stats/stats_table.cc

plugin/memcached_stats/stats_table.h

plugin/memcached_stats/tests/r/describe.result

plugin/memcached_stats/tests/r/query.result

plugin/memcached_stats/tests/t/describe.test

plugin/memcached_stats/tests/t/query.test

Show diffs side-by-side

added added

removed removed

plugin/memcached_stats/plugin.ini

1

1

[plugin]

2

title=Memcached Stats in I_S tables

3

description=Some I_S tables that provide Memcached stats

2

title=Memcached Stats in DATA_DICTIONARY tables

3

description=Some DATA_DICTIONARY tables that provide Memcached stats

4

4

disabled=yes

5

5

load_by_default=no

6

6

headers=stats_table.h analysis_table.h sysvar_holder.h

Older »