diff --git a/ChangeLog b/ChangeLog
index 5b333a0b0..d1453384b 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,11 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2004-06-17 Alexander M. Turek  <me@derrabus.de>
+    * libraries/dbi/mysql.dbi.php: Removed debug code.
+    * libraries/dbi/mysqli.dbi.php: If connecting fails, we don't know the
+      MySQL version.
+
 2004-06-17 Marc Delisle  <lem9@users.sourceforge.net>
     * libraries/common.lib.php: fix "original" theme colors
     * db_details_structure.php: cosmetic fix in error message
diff --git a/libraries/dbi/mysql.dbi.lib.php b/libraries/dbi/mysql.dbi.lib.php
index 95b34f9f3..5c61a607a 100644
--- a/libraries/dbi/mysql.dbi.lib.php
+++ b/libraries/dbi/mysql.dbi.lib.php
@@ -1,7 +1,7 @@
 <?php
 /* $Id$ */
 // vim: expandtab sw=4 ts=4 sts=4:
-error_reporting(E_ALL);
+
 /**
  * Interface to the classic MySQL extension
  */
diff --git a/libraries/dbi/mysqli.dbi.lib.php b/libraries/dbi/mysqli.dbi.lib.php
index 0e97db962..628d1fce6 100644
--- a/libraries/dbi/mysqli.dbi.lib.php
+++ b/libraries/dbi/mysqli.dbi.lib.php
@@ -206,7 +206,7 @@ function PMA_DBI_getError($link = NULL) {
 
     if ($error && $error == 2002) {
         $error = '#' . ((string) $error) . ' - ' . $GLOBALS['strServerNotResponding'];
-    } elseif ($error && PMA_MYSQL_INT_VERSION >= 40100) {
+    } elseif ($error && defined('PMA_MYSQL_INT_VERSION') && PMA_MYSQL_INT_VERSION >= 40100) {
         $error = '#' . ((string) $error) . ' - ' . $error_message;
     } elseif ($error) {
         $error = '#' . ((string) $error) . ' - ' . PMA_convert_display_charset($error_message);