diff --git a/ChangeLog b/ChangeLog
index 4bedf2662..576ea48f5 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2005-11-21 Michal Čihař  <michal@cihar.com>
+    * libraries/import/sql.php: Fix query splitting in some cases (reported by
+      Marc).
+
 2005-11-20 Marc Delisle  <lem9@users.sourceforge.net>
     ### 2.7.0-rc1 released
     * many files: $dbh becomes $controllink for better contrast with $userlink
diff --git a/libraries/import/sql.php b/libraries/import/sql.php
index 3c1270685..62872d0bc 100644
--- a/libraries/import/sql.php
+++ b/libraries/import/sql.php
@@ -89,7 +89,7 @@ if (isset($import_list)) {
                 if (!$endq) break;
                 $i++;
                 // Aren't we at the end?
-                if ($i == $len) {
+                if ($finished && $i == $len) {
                     $i--;
                 } else {
                     continue;