diff --git a/ChangeLog b/ChangeLog
index 20de278db..dba09c010 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2002-12-15 Marc Delisle  <lem9@users.sourceforge.net>
+    * libraries/get_foreign.lib.php3, tbl_change.php3: bug 646263,
+      bad drop-down in select sub-page
+
 2002-12-14 Alexander M. Turek  <rabus@users.sourceforge.net>
     * libraries/common.lib.php3: Removed a comment.
 
diff --git a/libraries/get_foreign.lib.php3 b/libraries/get_foreign.lib.php3
index 62766d0cd..53f2b0b5e 100755
--- a/libraries/get_foreign.lib.php3
+++ b/libraries/get_foreign.lib.php3
@@ -41,6 +41,9 @@
                              . ' ORDER BY ' . PMA_backquote($foreign_table) . '.' . PMA_backquote($foreign_display);
             $disp            = PMA_mysql_query($dispsql);
         }
+        else {
+            unset($disp);
+        }
     } // end if $foreigners
 
 //} // $__PMA_GET_FOREIGN_LIB_INCLUDED__
diff --git a/tbl_change.php3 b/tbl_change.php3
index 808cb5751..5a0421155 100755
--- a/tbl_change.php3
+++ b/tbl_change.php3
@@ -417,7 +417,8 @@ for ($i = 0; $i < $fields_cnt; $i++) {
         } // end while
         echo '            </select>' . "\n";
         echo '        </td>' . "\n";
-        unset($disp);
+        // is now unset in get_foreign.lib:
+        //unset($disp);
     }
     else if (strstr($row_table_def['True_Type'], 'text')) {
         ?>