diff options
| author | Marc Delisle <marc@infomarc.info> | 2015-09-02 15:07:15 +0300 |
|---|---|---|
| committer | Marc Delisle <marc@infomarc.info> | 2015-09-02 15:07:15 +0300 |
| commit | 4fe8c5f496aac45559c081ee610ea425ec593419 (patch) | |
| tree | 0df7401f02bad21b6c1058dc0c92e3c6529e2da3 /libraries | |
| parent | e24e0a69313312e2e259701706c102b08d6ab18a (diff) | |
| parent | 85f6849921e8a2ab5f0e5e2cd2f636ca93bab17c (diff) | |
Merge branch 'QA_4_5'
Diffstat (limited to 'libraries')
| -rw-r--r-- | libraries/server_privileges.lib.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php index 3eb2633d80..748f50ed67 100644 --- a/libraries/server_privileges.lib.php +++ b/libraries/server_privileges.lib.php @@ -1801,11 +1801,11 @@ function PMA_getCurrentAuthenticationPlugin( if (isset($row) && $row && ! empty($row['plugin'])) { $authentication_plugin = $row['plugin']; } - } else { + } elseif (PMA_MYSQL_INT_VERSION >= 50702) { $row = $GLOBALS['dbi']->fetchSingleRow( 'SELECT @@default_authentication_plugin' ); - $authentication_plugin = $row['Value']; + $authentication_plugin = $row['@@default_authentication_plugin']; } return $authentication_plugin; |