~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/module/library.cc

  • Committer: Olaf van der Spek
  • Date: 2011-07-05 12:15:12 UTC
  • mto: This revision was merged to the branch mainline in revision 2367.
  • Revision ID: olafvdspek@gmail.com-20110705121512-7c7iy6vf94gr61pk
UseĀ operator=

Show diffs side-by-side

added added

removed removed

Lines of Context:
83
83
  }
84
84
 
85
85
  void *dl_handle= NULL;
86
 
  string dlpath("");
 
86
  string dlpath;
87
87
 
88
88
  if (builtin)
89
89
  {
90
 
    dlpath.assign("<builtin>");
 
90
    dlpath= "<builtin>";
91
91
    dl_handle= dlopen(NULL, RTLD_NOW|RTLD_LOCAL);
92
92
    if (dl_handle == NULL)
93
93
    {
102
102
  else
103
103
  {
104
104
  /* Open new dll handle */
105
 
    dlpath.assign(Library::getLibraryPath(plugin_name).file_string());
 
105
    dlpath= Library::getLibraryPath(plugin_name).file_string();
106
106
    dl_handle= dlopen(dlpath.c_str(), RTLD_NOW|RTLD_GLOBAL);
107
107
    if (dl_handle == NULL)
108
108
    {