diff --git a/ChangeLog b/ChangeLog
index 7678d885e..b923d86c1 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2003-11-22 Marc Delisle  <lem9@users.sourceforge.net>
+    * tbl_properties_operations.php: display "Add constraints" only
+      if there are foreign keys in current table
+
 2003-11-21 Marc Delisle  <lem9@users.sourceforge.net>
     * tbl_move_copy.php: typo about constraints
 
diff --git a/tbl_properties_operations.php b/tbl_properties_operations.php
index e9144267f..d2993d2f5 100644
--- a/tbl_properties_operations.php
+++ b/tbl_properties_operations.php
@@ -208,9 +208,15 @@ for ($i = 0; $i < $num_dbs; $i++) {
                     <label for="checkbox_drop"><?php echo $strStrucDrop; ?></label>&nbsp;&nbsp;<br />
                     <input type="checkbox" name="auto_increment" value="1" id="checkbox_auto_increment" />
                     <label for="checkbox_auto_increment"><?php echo $strAddAutoIncrement; ?></label><br />
+                    <?php
+                    // display "Add constraints" choice only if there are
+                    // foreign keys
+                    if (PMA_getForeigners($db, $table, '', 'innodb')) {
+                    ?>
                     <input type="checkbox" name="constraints" value="1" id="checkbox_constraints" />
                     <label for="checkbox_constraints"><?php echo $strAddConstraints; ?></label><br />
                     <?php
+                    } // endif
                     if (isset($_COOKIE) && isset($_COOKIE['pma_switch_to_new']) && $_COOKIE['pma_switch_to_new'] == 'true') {
                         $pma_switch_to_new = 'true';
                     } elseif (isset($HTTP_COOKIE_VARS) && isset($HTTP_COOKIE_VARS['pma_switch_to_new']) && $HTTP_COOKIE_VARS['pma_switch_to_new'] == 'true') {