diff --git a/ChangeLog b/ChangeLog
index 2fccbf9d2..af5a8f6de 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2004-01-27 Marc Delisle  <lem9@users.sourceforge.net>
+    * main.php: bug 884606, MySQL version check before server choice
+
 2004-01-26 Robin Johnson <robbat2@users.sourceforge.net>
     * libraries/dbi/mysql.dbi.lib.php: Correct the default parameter for
     PMA_DBI_insert_id($link = '') and convert file back to UNIX linefeeds.
diff --git a/main.php b/main.php
index dd68333ba..475f20a8b 100644
--- a/main.php
+++ b/main.php
@@ -645,8 +645,8 @@ if (PMA_PHP_INT_VERSION < 40100) {
 /**
  * Warning for old MySQL version
  */
-
-if (PMA_MYSQL_INT_VERSION < 32332) {
+// not yet defined before the server choice
+if (defined('PMA_MYSQL_INT_VERSION') && PMA_MYSQL_INT_VERSION < 32332) {
     echo '<p class="warning">' . sprintf($strUpgrade, 'MySQL', '3.23.32') . '</p>' . "\n";
 }