bug #1811519 [privileges] fixed used collation for accessing mysql.user in server privileges
This commit is contained in:
@@ -22,6 +22,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
|
|||||||
+ [lang] Croatian update, thanks to Renato Pavicic
|
+ [lang] Croatian update, thanks to Renato Pavicic
|
||||||
- patch #1807615 [GUI] Display patch for column rights in Opera
|
- patch #1807615 [GUI] Display patch for column rights in Opera
|
||||||
- bug #1811519 Can't delete user with a german umlaut.
|
- bug #1811519 Can't delete user with a german umlaut.
|
||||||
|
- bug #1811519 [privileges] fixed used collation for accessing mysql.user in server privileges
|
||||||
- it should not be possible to move or copy a table to information_schema
|
- it should not be possible to move or copy a table to information_schema
|
||||||
|
|
||||||
2.11.1.1 (not yet released)
|
2.11.1.1 (not yet released)
|
||||||
|
@@ -749,10 +749,10 @@ if (!empty($adduser_submit) || !empty($change_copy)) {
|
|||||||
}
|
}
|
||||||
$res = PMA_DBI_query(
|
$res = PMA_DBI_query(
|
||||||
'SELECT \'foo\' FROM `mysql`.`user`'
|
'SELECT \'foo\' FROM `mysql`.`user`'
|
||||||
.' WHERE ' . PMA_convert_using('User')
|
.' WHERE CONVERT(`User` USING utf8) COLLATE utf8_bin '
|
||||||
.' = ' . PMA_convert_using(PMA_sqlAddslashes($username), 'quoted')
|
.' = CONVERT(\'' . PMA_sqlAddslashes($username) . '\' USING utf8) COLLATE utf8_bin '
|
||||||
.' AND ' . PMA_convert_using('Host')
|
.' AND CONVERT(`Host` USING utf8) COLLATE utf8_bin '
|
||||||
.' = ' . PMA_convert_using($hostname, 'quoted') . ';',
|
.' = CONVERT(\'' . PMA_sqlAddslashes($hostname) . '\' USING utf8) COLLATE utf8_bin ;',
|
||||||
null, PMA_DBI_QUERY_STORE);
|
null, PMA_DBI_QUERY_STORE);
|
||||||
if (PMA_DBI_num_rows($res) == 1) {
|
if (PMA_DBI_num_rows($res) == 1) {
|
||||||
PMA_DBI_free_result($res);
|
PMA_DBI_free_result($res);
|
||||||
|
Reference in New Issue
Block a user