diff --git a/ChangeLog b/ChangeLog
index a2a6c902a..f7095087b 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2002-04-23 Alexander M. Turek  <rabus@users.sourceforge.net>
+    * libraries/common.lib.php3: fixed bug #547605 using Loïc's patch.
+
 2002-04-22 Loïc Chapeaux  <lolo@phpheaven.net>
 	* lang/slovak-win1250.inc.php3: completed, thanks to Peter Svec.
 
diff --git a/libraries/common.lib.php3 b/libraries/common.lib.php3
index ff706b261..731fec303 100644
--- a/libraries/common.lib.php3
+++ b/libraries/common.lib.php3
@@ -569,7 +569,7 @@ if (!defined('PMA_COMMON_LIB_INCLUDED')){
             if (PMA_MYSQL_INT_VERSION >= 32330) {
                 $local_query      = 'SHOW VARIABLES LIKE \'safe_show_database\'';
                 $rs               = mysql_query($local_query, $dbh); // Debug: or PMA_mysqlDie('', $local_query, FALSE);
-                $is_safe_show_dbs = mysql_result($rs, 0, 'Value');
+                $is_safe_show_dbs = @mysql_result($rs, 0, 'Value');
 
                 // ... and if on, try to get the available dbs list
                 if ($is_safe_show_dbs && strtoupper($is_safe_show_dbs) != 'OFF') {