bug #1798786 [import] Wrong error when a string contains semicolon
This commit is contained in:
@@ -18,6 +18,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
|
|||||||
- bug #1851833 [display] Sorting forgets an explicit LIMIT
|
- bug #1851833 [display] Sorting forgets an explicit LIMIT
|
||||||
(fix for sorting on column headers)
|
(fix for sorting on column headers)
|
||||||
- bug #1764182 [cookies] Suhosin cookie encryption breaks phpMyAdmin
|
- 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)
|
2.11.3.0 (2007-12-08)
|
||||||
- patch #1818389 to remove a notice (failed to flush buffer), thanks to
|
- patch #1818389 to remove a notice (failed to flush buffer), thanks to
|
||||||
|
@@ -156,6 +156,7 @@ while (!($finished && $i >= $len) && !$error && !$timeout_passed) {
|
|||||||
$endq = TRUE;
|
$endq = TRUE;
|
||||||
$i = $len - 1;
|
$i = $len - 1;
|
||||||
}
|
}
|
||||||
|
$found_delimiter = false;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
// Was not the quote escaped?
|
// Was not the quote escaped?
|
||||||
@@ -165,6 +166,10 @@ while (!($finished && $i >= $len) && !$error && !$timeout_passed) {
|
|||||||
$endq = (((($pos - 1) - $j) % 2) == 0);
|
$endq = (((($pos - 1) - $j) % 2) == 0);
|
||||||
// Skip the string
|
// Skip the string
|
||||||
$i = $pos;
|
$i = $pos;
|
||||||
|
|
||||||
|
if ($first_sql_delimiter < $pos) {
|
||||||
|
$found_delimiter = false;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if (!$endq) {
|
if (!$endq) {
|
||||||
break;
|
break;
|
||||||
|
Reference in New Issue
Block a user