diff --git a/ChangeLog b/ChangeLog
index 5ce021e8d..b0b623ce1 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2004-10-19 Marc Delisle  <lem9@users.sourceforge.net>
+    * libraries/database_interface.lib.php: bug #1041667, correctly
+      check the server version instead of the client API version
+
 2004-10-19 Michal Čihař  <michal@cihar.com>
     * export.php: Use just \n for SQL exports (bug #1042521).
     * libraries/read_dump.lib.php: Set correct return value (bug #1048861).
diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php
index 0b443fa0f..1f1d02a72 100644
--- a/libraries/database_interface.lib.php
+++ b/libraries/database_interface.lib.php
@@ -40,7 +40,11 @@ function PMA_DBI_get_dblist($link = NULL) {
 
        // Before MySQL 4.0.2, SHOW DATABASES could send the
        // whole list, so check if we really have access:
-       if (PMA_MYSQL_CLIENT_API < 40002) {
+       //if (PMA_MYSQL_CLIENT_API < 40002) {
+       // Better check the server version, in case the client API
+       // is more recent than the server version
+
+       if (PMA_MYSQL_INT_VERSION < 40002) {
            $dblink = @PMA_DBI_select_db($row[0], $link);
            if (!$dblink) {
                continue;