diff --git a/libraries/classes/Query/Generator.php b/libraries/classes/Query/Generator.php index e0d4a0b542..5f0f58528c 100644 --- a/libraries/classes/Query/Generator.php +++ b/libraries/classes/Query/Generator.php @@ -229,7 +229,7 @@ class Generator . "'''" . $user . "''@''" . $host . "''' LIKE `GRANTEE`" . ' UNION ' . 'SELECT 1 FROM mysql.user ' - . "WHERE `create_user_priv` = 'Y' COLLATE utf8mb4_general_ci AND " + . "WHERE `create_user_priv` = 'Y' AND " . "'" . $user . "' LIKE `User` AND '' LIKE `Host`" . ' LIMIT 1'; } @@ -250,7 +250,7 @@ class Generator . "'''" . $user . "''@''" . $host . "''' LIKE `GRANTEE` " . ' UNION ' . 'SELECT 1 FROM mysql.user ' - . "WHERE `create_user_priv` = 'Y' COLLATE utf8mb4_general_ci AND " + . "WHERE `create_user_priv` = 'Y' AND " . "'" . $user . "' LIKE `User` AND '' LIKE `Host`" . ' LIMIT 1'; } diff --git a/test/classes/Stubs/DbiDummy.php b/test/classes/Stubs/DbiDummy.php index e47b70b04b..bff6e0dd69 100644 --- a/test/classes/Stubs/DbiDummy.php +++ b/test/classes/Stubs/DbiDummy.php @@ -583,7 +583,7 @@ class DbiDummy implements DbiExtension 'query' => 'SELECT 1 FROM `INFORMATION_SCHEMA`.`USER_PRIVILEGES`' . " WHERE `PRIVILEGE_TYPE` = 'CREATE USER'" . " AND '''pma_test''@''localhost''' LIKE `GRANTEE`" - . " UNION SELECT 1 FROM mysql.user WHERE `create_user_priv` = 'Y' COLLATE utf8mb4_general_ci" + . " UNION SELECT 1 FROM mysql.user WHERE `create_user_priv` = 'Y'" . " AND 'pma_test' LIKE `User` AND '' LIKE `Host` LIMIT 1", 'result' => [['1']], ], @@ -598,7 +598,7 @@ class DbiDummy implements DbiExtension . ' FROM `INFORMATION_SCHEMA`.`USER_PRIVILEGES`) t' . " WHERE `IS_GRANTABLE` = 'YES'" . " AND '''pma_test''@''localhost''' LIKE `GRANTEE`" - . " UNION SELECT 1 FROM mysql.user WHERE `create_user_priv` = 'Y' COLLATE utf8mb4_general_ci" + . " UNION SELECT 1 FROM mysql.user WHERE `create_user_priv` = 'Y'" . " AND 'pma_test' LIKE `User` AND '' LIKE `Host` LIMIT 1", 'result' => [['1']], ],