backport typos found

5b9ed285 · Sergei Golubchik · b188b1bf · 5b9ed285
Commit 5b9ed285 authored Dec 23, 2009 by Sergei Golubchik
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

sql/sql_plugin.cc sql/sql_plugin.cc +2 -3

No files found.
--- a/sql/sql_plugin.cc
+++ b/sql/sql_plugin.cc
@@ -440,7 +440,7 @@ static st_plugin_dl *plugin_dl_add(const LEX_STRING *dl, int report)
      (plugin_dl.version >> 8) > (MYSQL_PLUGIN_INTERFACE_VERSION >> 8))
  {
    free_plugin_mem(&plugin_dl);
-    report_error(report, ER_CANT_OPEN_LIBRARY, MYF(0), dlpath, 0,
+    report_error(report, ER_CANT_OPEN_LIBRARY, dlpath, 0,
                 "plugin interface version mismatch");
    DBUG_RETURN(0);
  }
@@ -469,8 +469,7 @@ static st_plugin_dl *plugin_dl_add(const LEX_STRING *dl, int report)
  if (!(sym= dlsym(plugin_dl.handle, plugin_declarations_sym)))
  {
    free_plugin_mem(&plugin_dl);
-    report_error(report, ER_CANT_FIND_DL_ENTRY, MYF(0),
+    report_error(report, ER_CANT_FIND_DL_ENTRY, plugin_declarations_sym);
-                 plugin_declarations_sym);
    DBUG_RETURN(0);
  }