Merge branch '2.3' into develop

This commit is contained in:
Markus Mäkelä 2019-05-22 15:57:46 +03:00
commit f8688a7285
No known key found for this signature in database
GPG Key ID: 72D48FCE664F7B19

View File

@ -824,8 +824,10 @@ static bool check_default_table_permissions(MYSQL* mysql,
for (MYSQL_ROW row = mysql_fetch_row(res); row; row = mysql_fetch_row(res))
{
if (strcasestr(row[0], "SHOW DATABASES"))
if (strcasestr(row[0], "SHOW DATABASES") || strcasestr(row[0], "ALL PRIVILEGES ON *.*"))
{
// GRANT ALL PRIVILEGES ON *.* will overwrite SHOW DATABASES so it needs to be checked
// separately
found = true;
break;
}