diff --git a/ChangeLog b/ChangeLog
index fb5415a08..6f266495c 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2006-03-23 Michal Čihař  <michal@cihar.com>
+    * libraries/import/sql.php: Fix handling of -- (bug #1453430).
+
 2006-03-23 Alexander M. Turek  <me@derrabus.de>
     * lang/german-*.inc.php: Updates, sync'ed some technical terms with the
       German MySQL manual.
diff --git a/libraries/import/sql.php b/libraries/import/sql.php
index 2b2eaad7d..1596842d4 100644
--- a/libraries/import/sql.php
+++ b/libraries/import/sql.php
@@ -72,7 +72,7 @@ if (isset($plugin_list)) {
                 $p4 = 2147483647;
             }
             $p5 = strpos($buffer, '--', $i);
-            if ($p5 === FALSE) {
+            if ($p5 === FALSE || $p5 >= ($len - 2) || $buffer[$p5 + 2] > ' ') {
                 $p5 = 2147483647;
             }
             $p6 = strpos($buffer, '/*', $i);