diff --git a/ChangeLog b/ChangeLog
index 112b35583..3be621daa 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2002-03-26 Loïc Chapeaux  <lolo@phpheaven.net>
+	* libraries/common.lib.php3, lines 146-152, 519-524 & 567: fixed bug
+	  #534794 - special user can't see the db's list.
+
 2002-03-26 Marc Delisle  <lem9@users.sourceforge.net>
 	* libraries/display_tbl.lib.php3, Documentation.html:
 	  support for non-numeric keys in the 'relation' feature
diff --git a/libraries/common.lib.php3 b/libraries/common.lib.php3
index 3148c4d41..b8fa25d17 100644
--- a/libraries/common.lib.php3
+++ b/libraries/common.lib.php3
@@ -143,7 +143,13 @@ if (!defined('PMA_COMMON_LIB_INCLUDED')){
         $cfgLeftFrameLight      = TRUE;
     }
 
-    // Gets some constants
+    /**
+     * Gets constants that defines the PHP, MySQL... releases.
+     * This include must be located physically before any code that needs to
+     * reference the constants, else PHP 3.0.16 won't be happy; and must be
+     * located after we are connected to db to get the MySql version (see
+     * below).
+     */
     include('./libraries/defines.lib.php3');
 
     // If zlib output compression is set in the php configuration file, no
@@ -516,6 +522,10 @@ if (!defined('PMA_COMMON_LIB_INCLUDED')){
             $dbh = $userlink;
         }
 
+        // Runs the "defines.lib.php3" for the second time to get the mysql
+        // release number
+        include('./libraries/defines.lib.php3');
+
         // if 'only_db' is set for the current user, there is no need to check for
         // available databases in the "mysql" db
         $dblist_cnt = count($dblist);
@@ -554,8 +564,7 @@ if (!defined('PMA_COMMON_LIB_INCLUDED')){
         else {
             // ... first checks whether the "safe_show_database" is on or not
             //     (if MYSQL supports this)
-            if (defined('PMA_MYSQL_INT_VERSION') &&
-                PMA_MYSQL_INT_VERSION >= 32330) {
+            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');
@@ -739,15 +748,6 @@ if (!defined('PMA_COMMON_LIB_INCLUDED')){
     } // end of the 'PMA_availableDatabases()' function
 
 
-    /**
-     * Gets constants that defines the PHP, MySQL... releases.
-     * This include must be located physically before any code that needs to
-     * reference the constants, else PHP 3.0.16 won't be happy; and must be
-     * located after we are connected to db to get the MySql version.
-     */
-    include('./libraries/defines.lib.php3');
-
-
 
     /* ----------------------- Set of misc functions ----------------------- */