← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/status_dictionary/dictionary.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/status_dictionary/dictionary.cc
31
31
static VariablesTool *session_variables;
32
32
 
33
33
 
34
 
static int init(drizzled::plugin::Registry &registry)
 
34
static int init(drizzled::plugin::Context &context)
35
35
{
36
36
  global_statements= new(std::nothrow)StatementsTool(true);
37
37
  global_status= new(std::nothrow)StatusTool(true);
40
40
  global_variables= new(std::nothrow)VariablesTool(true);
41
41
  session_variables= new(std::nothrow)VariablesTool(false);
42
42
 
43
 
  registry.add(global_statements);
44
 
  registry.add(global_status);
45
 
  registry.add(global_variables);
46
 
  registry.add(session_statements);
47
 
  registry.add(session_status);
48
 
  registry.add(session_variables);
 
43
  context.add(global_statements);
 
44
  context.add(global_status);
 
45
  context.add(global_variables);
 
46
  context.add(session_statements);
 
47
  context.add(session_status);
 
48
  context.add(session_variables);
49
49
  
50
50
  return 0;
51
51
}
52
52
 
53
 
static int finalize(drizzled::plugin::Registry &registry)
54
 
{
55
 
  registry.remove(global_statements);
56
 
  registry.remove(global_status);
57
 
  registry.remove(global_variables);
58
 
  registry.remove(session_statements);
59
 
  registry.remove(session_status);
60
 
  registry.remove(session_variables);
61
 
 
62
 
  delete global_statements;
63
 
  delete global_status;
64
 
  delete global_variables;
65
 
  delete session_statements;
66
 
  delete session_status;
67
 
  delete session_variables;
68
 
 
69
 
  return 0;
70
 
}
71
 
 
72
53
DRIZZLE_DECLARE_PLUGIN
73
54
{
74
55
  DRIZZLE_VERSION_ID,
78
59
  "Dictionary for status, statement, and variable information.",
79
60
  PLUGIN_LICENSE_GPL,
80
61
  init,
81
 
  finalize,
82
62
  NULL,
83
63
  NULL
84
64
}