Merge branch '2.3' into 2.4

This commit is contained in:
Johan Wikman
2019-08-02 10:03:34 +03:00
8 changed files with 138 additions and 86 deletions

View File

@ -61,7 +61,7 @@ static const char mysqlauth_validate_user_query[] =
static const char mysqlauth_validate_user_query_lower[] =
"SELECT password FROM " MYSQLAUTH_USERS_TABLE_NAME
" WHERE user = '%s' AND ( '%s' = host OR '%s' LIKE host)"
" AND (anydb = '1' OR LOWER('%s') IN ('', 'information_schema') OR LOWER('%s') LIKE LOWER(db)"
" AND (anydb = '1' OR LOWER('%s') IN ('', 'information_schema') OR LOWER('%s') LIKE LOWER(db))"
" LIMIT 1";
/** Query that only checks if there's a matching user */