bug #1389165, shows all columns as Null Yes

3 files changed, 4 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 4e46295950..b87a352f7b 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,7 +6,8 @@ $Id$
 $Source$
 
 2006-01-06 Marc Delisle  <lem9@users.sourceforge.net>
-    * db_datadict.php: bug #1389165, data dict shows all columns as Null Yes
+    * db_datadict.php, pdf_schema.php: bug #1389165, data dict shows all 
+      columns as Null Yes
 
 2006-01-04 Marc Delisle  <lem9@users.sourceforge.net>
     * server_privileges.php: since we use DROP USER, some options to
diff --git a/db_datadict.php b/db_datadict.php
index 2aeefbd4a4..0f0746c354 100644
--- a/db_datadict.php
+++ b/db_datadict.php
@@ -216,7 +216,7 @@ while ($row = PMA_DBI_fetch_assoc($rowset)) {
             $strAttribute = 'UNSIGNED ZEROFILL';
         }
         if (!isset($row['Default'])) {
-            if ($row['Null'] != '') {
+            if ($row['Null'] != '' && $row['Null'] != 'NO') {
                 $row['Default'] = '<i>NULL</i>';
             }
         } else {
diff --git a/pdf_schema.php b/pdf_schema.php
index 6064a30251..bbfa4a6248 100644
--- a/pdf_schema.php
+++ b/pdf_schema.php
@@ -1479,7 +1479,7 @@ function PMA_RT_DOC($alltables ){
             $pdf_row = array($field_name ,
                             $type ,
                             $strAttribute ,
-                            ($row['Null'] == '') ? $GLOBALS['strNo'] : $GLOBALS['strYes'],
+                            ($row['Null'] == '' || $row['Null'] == 'NO') ? $GLOBALS['strNo'] : $GLOBALS['strYes'],
                             ((isset($row['Default'])) ?  $row['Default'] : ''),
                             $row['Extra']  ,
                             ((isset($res_rel[$field_name])) ? $res_rel[$field_name]['foreign_table'] . ' -> ' . $res_rel[$field_name]['foreign_field'] : ''),