bug #1875010 [auth] MySQL server and client version mismatch (mysql ext.)

2008-01-27 13:22:36 +00:00
parent 0858e97184
commit 592f95c76a
2 changed files with 2 additions and 1 deletions
--- a/libraries/dbi/mysql.dbi.lib.php
+++ b/libraries/dbi/mysql.dbi.lib.php
@@ -81,7 +81,7 @@ function PMA_DBI_connect($user, $password, $is_controluser = FALSE) {
        $link = PMA_DBI_real_connect($cfg['Server']['host'] . $server_port . $server_socket, $user, '', empty($client_flags) ? NULL : $client_flags);
    }

-    if (empty($link) && ! $is_controluser) {
+    if (empty($link)) {
        if ($is_controluser) {
            if (! defined('PMA_DBI_CONNECT_FAILED_CONTROLUSER')) {
                define('PMA_DBI_CONNECT_FAILED_CONTROLUSER', true);