diff --git a/ChangeLog b/ChangeLog
index 1653c9bd6..cfa4e43fe 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,9 @@ $Source$
 2003-03-01 Marc Delisle  <lem9@users.sourceforge.net>
     * lang/english: typo
     * tbl_dump.php3: undefined variable $use_comments
+    * tbl_properties_export.php3: bug 692143: now we remove the 
+      LIMIT clause from the original query to use the limits entered
+      on the export form
 
 2003-03-01 Michal Cihar  <nijel@users.sourceforge.net>
     * tbl_indexes.php3: Cleaner solution for showing query after changing
diff --git a/tbl_properties_export.php3 b/tbl_properties_export.php3
index 78d589b44..f9680b196 100755
--- a/tbl_properties_export.php3
+++ b/tbl_properties_export.php3
@@ -19,6 +19,35 @@ require('./tbl_properties_table_info.php3');
 <?php
 if (isset($sql_query)) {
     $sql_query = stripslashes($sql_query);
+
+    // I don't want the LIMIT clause, so I use the analyzer
+    // to reconstruct the query with only some parts
+    // because the LIMIT clause may come from us (sql.php3, sql_limit_to_append
+    // or may come from the user.
+    // Then, the limits set in the form will be added.
+    // TODO: do we need some other parts here, like PROCEDURE or FOR UPDATE?
+
+    $parsed_sql = PMA_SQP_parse($sql_query);
+    $analyzed_sql = PMA_SQP_analyze($parsed_sql);
+    $sql_query = 'SELECT ' . $analyzed_sql[0]['select_expr_clause'];
+
+    if (!empty($analyzed_sql[0]['from_clause'])) {
+        $sql_query .= ' FROM ' . $analyzed_sql[0]['from_clause'];
+    }
+    if (!empty($analyzed_sql[0]['where_clause'])) {
+        $sql_query .= ' WHERE ' . $analyzed_sql[0]['where_clause'];
+    }
+    if (!empty($analyzed_sql[0]['group_by_clause'])) {
+        $sql_query .= ' GROUP BY ' . $analyzed_sql[0]['group_by_clause'];
+    }
+    if (!empty($analyzed_sql[0]['having_clause'])) {
+        $sql_query .= ' HAVING ' . $analyzed_sql[0]['having_clause'];
+    }
+    if (!empty($analyzed_sql[0]['order_by_clause'])) {
+        $sql_query .= ' ORDER BY ' . $analyzed_sql[0]['order_by_clause'];
+    }
+
+    // TODO: can we avoid reparsing the query here?
     PMA_showMessage($GLOBALS['strSQLQuery']);
 }
 ?>