diff --git a/ChangeLog b/ChangeLog
index b27c6cc3d..1aa3f2ad6 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2005-03-25 Marc Delisle  <lem9@users.sourceforge.net>
+    * tbl_properties.inc.php: bug #1170255, undefined index: Field
+
 2005-03-25 Alexander M. Turek  <me@derrabus.de>
     * db_details_structure.php: Let's prefer separate icons over CSS 3 hacks
       for marking a functionality as unavailable.
diff --git a/tbl_properties.inc.php b/tbl_properties.inc.php
index 83b6a3166..bc2cf2c05 100644
--- a/tbl_properties.inc.php
+++ b/tbl_properties.inc.php
@@ -1,7 +1,7 @@
 <?php
 /* $Id$ */
 // vim: expandtab sw=4 ts=4 sts=4:
-
+error_reporting(E_ALL);
 // Check parameters
 require_once('./libraries/common.lib.php');
 PMA_checkParameters(array('db','table','action','num_fields'));
@@ -318,13 +318,12 @@ for ($i = 0 ; $i < $num_fields; $i++) {
         $attribute = $submit_attribute;
     }
 
-
     // MySQL 4.1.2+ TIMESTAMP options
     // (if on_update_current_timestamp is set, then it's TRUE)
-    if (isset($analyzed_sql[0]['create_table_fields'][$row['Field']]['on_update_current_timestamp'])) {
+    if (isset($row['Field']) && isset($analyzed_sql[0]['create_table_fields'][$row['Field']]['on_update_current_timestamp'])) {
         $attribute = 'ON UPDATE CURRENT_TIMESTAMP';
     }
-    if (isset($analyzed_sql[0]['create_table_fields'][$row['Field']]['default_current_timestamp'])) {
+    if (isset($row['Field']) && isset($analyzed_sql[0]['create_table_fields'][$row['Field']]['default_current_timestamp'])) {
         $default_current_timestamp = TRUE; 
     } else {
         $default_current_timestamp = FALSE;