← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/plugin/query_cache.h

  • 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:
drizzled/plugin/query_cache.h
24
24
 
25
25
#include "drizzled/plugin/plugin.h"
26
26
 
 
27
namespace drizzled
 
28
{
27
29
class Session;
28
30
 
29
 
namespace drizzled
30
 
{
31
31
namespace plugin
32
32
{
33
33