diff --git a/ChangeLog b/ChangeLog
index 75bc57a20..6fd30fb20 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,12 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2005-03-06 Marc Delisle  <lem9@users.sourceforge.net>
+    * libraries/relation.lib.php, /display_export.lib.php,
+      /export/sql.php: native comments. For MySQL 4.1.x+ I do not display
+      the "Add into comments ... Comments" choice, since they are
+      part of the structure
+
 2005-03-06 Alexander M. Turek  <me@derrabus.de>
     * lang/*.inc.php, libraries/engines/innodb.lib.php: InnoDB buffer pool
       activity statistics.
@@ -15,8 +21,6 @@ $Source$
     * tbl_alter.php, tbl_addfield.php, db_datadict.php, pdf_schema.php,
       tbl_create.php, libraries/common.lib.php, /relation.lib.php,
       /database_interface.lib.php: MySQL 4.1.x native comments
-      (First phase of merge, so it's experimental.
-       TODO: export and native comments; tbl_move_copy)
 
 2005-03-05 Alexander M. Turek  <me@derrabus.de>
     * server_engines.php, lang/*.inc.php, libraries/storage_engines.lib.php
diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php
index de935e407..292dca30e 100644
--- a/libraries/display_export.lib.php
+++ b/libraries/display_export.lib.php
@@ -227,7 +227,7 @@ if (!$hide_structure) { ?>
                         &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="checkbox" name="sql_relation" value="yes" id="checkbox_sql_use_relation" <?php PMA_exportCheckboxCheck('sql_relation'); ?> style="vertical-align: middle" /><label for="checkbox_sql_use_relation"><?php echo $strRelations; ?></label><br />
 <?php
     } // end relation
-    if (!empty($cfgRelation['commwork'])) {
+    if (!empty($cfgRelation['commwork']) && PMA_MYSQL_INT_VERSION < 40100) {
 ?>
                         &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="checkbox" name="sql_comments" value="yes" id="checkbox_sql_use_comments" <?php PMA_exportCheckboxCheck('sql_comments'); ?> style="vertical-align: middle" /><label for="checkbox_sql_use_comments"><?php echo $strComments; ?></label><br />
 <?php
diff --git a/libraries/export/sql.php b/libraries/export/sql.php
index f365e3400..ba8ee4e77 100644
--- a/libraries/export/sql.php
+++ b/libraries/export/sql.php
@@ -331,8 +331,11 @@ function PMA_getTableComments($db, $table, $crlf, $do_relation = false, $do_comm
 
     $schema_create = '';
 
+    // triggered only for MySQL < 4.1.x (pmadb-style comments)
     if ($do_comments && $cfgRelation['commwork']) {
-        if (!($comments_map = PMA_getComments($db, $table))) unset($comments_map);
+        if (!($comments_map = PMA_getComments($db, $table))) {
+            unset($comments_map);
+        }
     }
 
     // Check if we can use Relations (Mike Beck)
diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php
index f560765e9..942ad28d9 100644
--- a/libraries/relation.lib.php
+++ b/libraries/relation.lib.php
@@ -523,6 +523,7 @@ function PMA_handleSlashes($val) {
  * @param   string   the name of the column
  * @param   string   the value of the column
  * @param   string   (optional) if a column is renamed, this is the name of the former key which will get deleted
+ * @param   string   whether we set pmadb comments, native comments or both
  *
  * @return  boolean  true, if comment-query was made.
  *