Give a better error message if we can't load mysql.plugin table

This commit is contained in:
Michael Widenius 2020-02-12 18:31:09 +02:00 committed by Monty
parent 44790f58ac
commit 324e42fbdc

View File

@ -1856,11 +1856,13 @@ static void plugin_load(MEM_ROOT *tmp_root)
{ {
DBUG_PRINT("error",("Can't open plugin table")); DBUG_PRINT("error",("Can't open plugin table"));
if (!opt_help) if (!opt_help)
sql_print_error("Could not open mysql.plugin table. " sql_print_error("Could not open mysql.plugin table: \"%s\". "
"Some plugins may be not loaded"); "Some plugins may be not loaded",
new_thd->get_stmt_da()->message());
else else
sql_print_warning("Could not open mysql.plugin table. " sql_print_warning("Could not open mysql.plugin table: \"%s\". "
"Some options may be missing from the help text"); "Some options may be missing from the help text",
new_thd->get_stmt_da()->message());
goto end; goto end;
} }