diff --git a/ChangeLog b/ChangeLog
index 57bf4ba18f..9bd4cc39e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,6 +18,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 - bug #1851833 [display] Sorting forgets an explicit LIMIT
  (fix for sorting on column headers)
 - bug #1764182 [cookies] Suhosin cookie encryption breaks phpMyAdmin
+- bug #1798786 [import] Wrong error when a string contains semicolon
 
 2.11.3.0 (2007-12-08)
 - patch #1818389 to remove a notice (failed to flush buffer), thanks to
diff --git a/libraries/import/sql.php b/libraries/import/sql.php
index 2cd2fec419..f08e5e23e2 100644
--- a/libraries/import/sql.php
+++ b/libraries/import/sql.php
@@ -156,6 +156,7 @@ while (!($finished && $i >= $len) && !$error && !$timeout_passed) {
                         $endq = TRUE;
                         $i = $len - 1;
                     }
+                    $found_delimiter = false;
                     break;
                 }
                 // Was not the quote escaped?
@@ -165,6 +166,10 @@ while (!($finished && $i >= $len) && !$error && !$timeout_passed) {
                 $endq = (((($pos - 1) - $j) % 2) == 0);
                 // Skip the string
                 $i = $pos;
+
+                if ($first_sql_delimiter < $pos) {
+                    $found_delimiter = false;
+                }
             }
             if (!$endq) {
                 break;