From 592f95c76a53efe7715071292882145329b1d1e8 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Sun, 27 Jan 2008 13:22:36 +0000
Subject: [PATCH] bug #1875010 [auth] MySQL server and client version mismatch
 (mysql ext.)

---
 ChangeLog                       | 1 +
 libraries/dbi/mysql.dbi.lib.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 45152e579..7d5fd671c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 - bug #1871164 [GUI] Empty and navigation frame synch. 
 - patch #1873188 [GUI] Making db pager work when js is disabled,
   thanks to Jürgen Wind - windkiel
+- bug #1875010 [auth] MySQL server and client version mismatch (mysql ext.) 
 
 2.11.4.0 (2008-01-12)
 - bug #1843428 [GUI] Space issue with DROP/DELETE/ALTER TABLE 
diff --git a/libraries/dbi/mysql.dbi.lib.php b/libraries/dbi/mysql.dbi.lib.php
index 7ccf1f927..bd4bd1227 100644
--- 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);