From 1480adb634532b0f6faf4ab1e16fa78a1b98811d Mon Sep 17 00:00:00 2001
From: "Alexander M. Turek" <me@derrabus.de>
Date: Thu, 7 Nov 2002 19:54:10 +0000
Subject: [PATCH] bug #628581

---
 ChangeLog                      | 2 ++
 tbl_properties_operations.php3 | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 5247ba5ad..750c708ee 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,8 @@ $Source$
 2002-11-07 Alexander M. Turek  <rabus@users.sourceforge.net>
     * libraries/config_import.lib.php3: Fixed a small inconsistance.
     * config.inc.php3: Added a note about bug #634931.
+    * tbl_properties_operations.php3: Fixed bug #628581 (Check referential
+      integrity and NULL foreign key).
 
 2002-11-06 Alexander M. Turek  <rabus@users.sourceforge.net>
     * translators.html, lang/*.inc.php3: Fixed some typos.
diff --git a/tbl_properties_operations.php3 b/tbl_properties_operations.php3
index a03d23af9..b2d206d40 100755
--- a/tbl_properties_operations.php3
+++ b/tbl_properties_operations.php3
@@ -318,7 +318,9 @@ if ($cfgRelation['relwork']) {
                              . ' = ' . PMA_backquote($arr['foreign_table']) . '.' . PMA_backquote($arr['foreign_field'])
                              . ' WHERE '
                              . PMA_backquote($arr['foreign_table']) . '.' . PMA_backquote($arr['foreign_field'])
-                             . ' IS NULL')
+                             . ' IS NULL AND '
+                             . PMA_backquote($table) . '.' . PMA_backquote($master)
+                             . ' IS NOT NULL')
                  . '">' . $master . '&nbsp;->&nbsp;' . $arr['foreign_table'] . '.' . $arr['foreign_field']
                  . '</a><br />' . "\n";
         } //  end while