diff --git a/ChangeLog b/ChangeLog index 3c3bd9324..ba1f54f91 100755 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,10 @@ phpMyAdmin - Changelog $Id$ $Source$ +2002-03-14 Marc Delisle + * libraries/common.lib.php3, PMA_MYSQL_INT_VERSION is not yet defined + before the connection + 2002-03-13 Marc Delisle * libraries/common.lib.php3: bug 528961 safe_show_database diff --git a/libraries/common.lib.php3 b/libraries/common.lib.php3 index 4b028a3d8..01fa4536e 100644 --- a/libraries/common.lib.php3 +++ b/libraries/common.lib.php3 @@ -540,7 +540,8 @@ if (!defined('PMA_COMMON_LIB_INCLUDED')){ else { // ... first checks whether the "safe_show_database" // is on or not (if MYSQL supports this) - if (PMA_MYSQL_INT_VERSION >= 32330) { + if (defined('PMA_MYSQL_INT_VERSION') && + 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');