diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-11-13 23:03:48 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-11-13 23:03:48 +0100 |
| commit | 4157185f241f1583729020ba67064db0391aaa3d (patch) | |
| tree | f0662e17995b49d92ed706a33c894485a67678fe /sql/sql_plugin.cc | |
| parent | c155890af90ec75555fa485387a0cf11120175a6 (diff) | |
| parent | bdd883ed9a68ff1e82528cc6b33316d98894cfd2 (diff) | |
| download | mariadb-git-4157185f241f1583729020ba67064db0391aaa3d.tar.gz | |
10.0-base merge
Diffstat (limited to 'sql/sql_plugin.cc')
| -rw-r--r-- | sql/sql_plugin.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc index 0ece0e1967d..72c7ca2b0cc 100644 --- a/sql/sql_plugin.cc +++ b/sql/sql_plugin.cc @@ -515,7 +515,7 @@ static my_bool read_mysql_plugin_info(struct st_plugin_dl *plugin_dl, if (plugin_dl->mysqlversion < min_plugin_interface_version || (plugin_dl->mysqlversion >> 8) > (MYSQL_PLUGIN_INTERFACE_VERSION >> 8)) { - report_error(report, ER_CANT_OPEN_LIBRARY, dlpath, 0, + report_error(report, ER_CANT_OPEN_LIBRARY, dlpath, ENOEXEC, "plugin interface version mismatch"); DBUG_RETURN(TRUE); } @@ -636,7 +636,7 @@ static my_bool read_maria_plugin_info(struct st_plugin_dl *plugin_dl, if (plugin_dl->mariaversion < min_maria_plugin_interface_version || (plugin_dl->mariaversion >> 8) > (MARIA_PLUGIN_INTERFACE_VERSION >> 8)) { - report_error(report, ER_CANT_OPEN_LIBRARY, dlpath, 0, + report_error(report, ER_CANT_OPEN_LIBRARY, dlpath, ENOEXEC, "plugin interface version mismatch"); DBUG_RETURN(TRUE); } @@ -780,7 +780,7 @@ static st_plugin_dl *plugin_dl_add(const LEX_STRING *dl, int report) my_snprintf(buf, sizeof(buf), "service '%s' interface version mismatch", list_of_services[i].name); - report_error(report, ER_CANT_OPEN_LIBRARY, dlpath, 0, buf); + report_error(report, ER_CANT_OPEN_LIBRARY, dlpath, ENOEXEC, buf); goto ret; } *(void**)sym= list_of_services[i].service; @@ -1073,7 +1073,7 @@ static bool plugin_add(MEM_ROOT *tmp_root, plugin_type_names[plugin->type].str, " plugin ", tmp.name.str, " not supported by this version of the server", NullS); - report_error(report, ER_CANT_OPEN_LIBRARY, dl->str, 0, buf); + report_error(report, ER_CANT_OPEN_LIBRARY, dl->str, ENOEXEC, buf); goto err; } if (plugin_maturity_map[plugin->maturity] < plugin_maturity) @@ -1085,7 +1085,7 @@ static bool plugin_add(MEM_ROOT *tmp_root, " is prohibited by --plugin-maturity=", plugin_maturity_names[plugin_maturity], NullS); - report_error(report, ER_CANT_OPEN_LIBRARY, dl->str, 0, buf); + report_error(report, ER_CANT_OPEN_LIBRARY, dl->str, EPERM, buf); goto err; } tmp.plugin= plugin; |