← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/plugin/registry.cc

  • Committer: Monty Taylor
  • Date: 2010-05-15 17:45:43 UTC
  • mto: (1530.6.1)
  • mto: This revision was merged to the branch mainline in revision 1556.
  • Revision ID: mordred@inaugust.com-20100515174543-2d0x7jvyo89htgre
Changed the builtin plugin code path to work exactly the same as dynamic.
Allows us to use --plugin-remove on builtins.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/plugin/registry.cc
113
113
  return plugins;
114
114
}
115
115
 
116
 
plugin::Library *plugin::Registry::addLibrary(const string &plugin_name)
 
116
 
 
117
plugin::Library *plugin::Registry::addLibrary(const string &plugin_name,
 
118
                                              bool builtin)
117
119
{
118
120
 
119
121
  /* If this dll is already loaded just return it */
123
125
    return library;
124
126
  }
125
127
 
126
 
  library= plugin::Library::loadLibrary(plugin_name);
 
128
  library= plugin::Library::loadLibrary(plugin_name, builtin);
127
129
  if (library != NULL)
128
130
  {
129
131
    /* Add this dll to the map */