← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/module/loader.cc

  • Committer: Brian Aker
  • Date: 2010-10-27 20:29:24 UTC
  • mfrom: (1883 staging)
  • mto: This revision was merged to the branch mainline in revision 1885.
  • Revision ID: brian@tangent.org-20101027202924-7o9s4nhvqgj9oskq
Merge with trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/module/loader.cc
162
162
                             bool builtin= false);
163
163
static int test_plugin_options(memory::Root *, module::Module *,
164
164
                               po::options_description &long_options);
165
 
static void unlock_variables(Session *session, struct system_variables *vars);
166
 
static void cleanup_variables(system_variables *vars);
 
165
static void unlock_variables(Session *session, drizzle_system_variables *vars);
 
166
static void cleanup_variables(drizzle_system_variables *vars);
167
167
static void plugin_vars_free_values(module::Module::Variables &vars);
168
168
 
169
169
/* declared in set_var.cc */
1063
1063
/*
1064
1064
  Unlocks all system variables which hold a reference
1065
1065
*/
1066
 
static void unlock_variables(Session *, struct system_variables *vars)
 
1066
static void unlock_variables(Session *, struct drizzle_system_variables *vars)
1067
1067
{
1068
1068
  vars->storage_engine= NULL;
1069
1069
}
1075
1075
  Unlike plugin_vars_free_values() it frees all variables of all plugins,
1076
1076
  it's used on shutdown.
1077
1077
*/
1078
 
static void cleanup_variables(system_variables *vars)
 
1078
static void cleanup_variables(drizzle_system_variables *vars)
1079
1079
{
1080
1080
  assert(vars->storage_engine == NULL);
1081
1081