diff --git a/ChangeLog b/ChangeLog
index 63005dfa4..cd33cbdd5 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2005-01-07 Marc Delisle  <lem9@users.sourceforge.net>
+    * tbl_addfield.php: bug #1082680, undefined $field_charset when adding
+      a FLOAT field in MySQL 4.1.x
+
 2005-01-07 Michal Čihař  <michal@cihar.com>
     * Documentation.html, tbl_change.php, tbl_properties.inc.php,
       libraries/functions.js, libraries/tbl_change.js,
diff --git a/tbl_addfield.php b/tbl_addfield.php
index 72557b8ea..a64cde4f5 100644
--- a/tbl_addfield.php
+++ b/tbl_addfield.php
@@ -62,7 +62,7 @@ if (isset($submit_num_fields)) {
         }
         if ($field_attribute[$i] != '') {
             $query .= ' ' . $field_attribute[$i];
-        } else if (PMA_MYSQL_INT_VERSION >= 40100 && $field_charset[$i] != '') {
+        } else if (PMA_MYSQL_INT_VERSION >= 40100 && isset($field_charset[$i]) && $field_charset[$i] != '') {
             $query .= ' CHARACTER SET ' . $field_charset[$i];
         }
         if ($field_default[$i] != '') {