Fix for not being able to create users on Percona Server

Inspired by the patch 9bf88cbd32.patch

Signed-off-by: Bert-Jan de Lange <info@bert-jan.com>
Signed-off-by: Marc Delisle <marc@infomarc.info>
This commit is contained in:
Bert-Jan de Lange 2015-11-27 13:55:50 +01:00 committed by Marc Delisle
parent 25bd0b56e2
commit bc89aabdf9

View File

@ -5089,7 +5089,7 @@ function PMA_getSqlQueriesForDisplayAndAddUser($username, $hostname, $password)
// 'IDENTIFIED WITH auth_plugin'
// is supported by MySQL 5.5.7+
if ($serverType == 'MySQL'
if (($serverType == 'MySQL' || $serverType == 'Percona Server')
&& PMA_MYSQL_INT_VERSION >= 50507
&& isset($_REQUEST['authentication_plugin'])
) {
@ -5136,7 +5136,7 @@ function PMA_getSqlQueriesForDisplayAndAddUser($username, $hostname, $password)
// newer MySQL versions
// and 'CREATE USER ... USING .. VIA ..' syntax for
// newer MariaDB versions
if (($serverType == 'MySQL'
if ((($serverType == 'MySQL' || $serverType == 'Percona Server')
&& PMA_MYSQL_INT_VERSION >= 50706)
|| ($serverType == 'MariaDB'
&& PMA_MYSQL_INT_VERSION >= 50200)