diff --git a/ChangeLog b/ChangeLog
index 9d2b7f451..ce7b81d7e 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2005-10-14 Marc Delisle  <lem9@users.sourceforge.net>
+    * libraries/dbi/mysqli.dbi.lib.php: problem under MySQL 4.0.x
+
 2005-10-14 Michal Čihař  <michal@cihar.com>
     * libraries/sql_query_form.lib.php: Do not attempt to read upload dir when
       not configured.
diff --git a/libraries/dbi/mysqli.dbi.lib.php b/libraries/dbi/mysqli.dbi.lib.php
index 3e426367c..bdf00c32d 100644
--- a/libraries/dbi/mysqli.dbi.lib.php
+++ b/libraries/dbi/mysqli.dbi.lib.php
@@ -144,6 +144,11 @@ function PMA_mysqli_fetch_array($result, $type = FALSE) {
         if ($num > 0) {
             $fields = PMA_DBI_get_fields_meta($result);
         }
+        // sometimes, mysqli_fetch_fields() does not return results
+        // (as seen in PHP 5.1.0-dev), so for now, return $data unchanged
+        if (!$fields) {
+            return $data;
+        }
         $i = 0;
         for ($i = 0; $i < $num; $i++) {
             if (!isset($fields[$i]->type)) {