nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug #1823045 [import] Error importing file with lowercase "delimiter"

Browse Source
This commit is contained in:
Marc Delisle
2007-11-07 18:08:29 +00:00
parent b1bb38a306
commit 37ca5ac56d
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -31,6 +31,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
- bug #1777249 [display] Do not underline links in left panel (in default - bug #1777249 [display] Do not underline links in left panel (in default
themes) themes)
- bug #1826022 [privileges] unable to add user (MySQL 3.23) since PMA 2.11.2 - bug #1826022 [privileges] unable to add user (MySQL 3.23) since PMA 2.11.2
- bug #1823045 [import] Error importing file with lowercase "delimiter"
2.11.2.0 (2007-10-27) 2.11.2.0 (2007-10-27)
- patch #1791576 HTTP auth: support REDIRECT_REMOTE_USER, thanks to Allard - patch #1791576 HTTP auth: support REDIRECT_REMOTE_USER, thanks to Allard

5
libraries/import/sql.php
View File

@@ -108,7 +108,8 @@ while (!($finished && $i >= $len) && !$error && !$timeout_passed) {
if ($p7 === FALSE) { if ($p7 === FALSE) {
$p7 = $big_value; $p7 = $big_value;
} }
$p8 = strpos($buffer, 'DELIMITER', $i); // catch also "delimiter"
$p8 = stripos($buffer, 'DELIMITER', $i);
if ($p8 === FALSE || $p8 >= ($len - 11) || $buffer[$p8 + 9] > ' ') { if ($p8 === FALSE || $p8 >= ($len - 11) || $buffer[$p8 + 9] > ' ') {
$p8 = $big_value; $p8 = $big_value;
} }
@@ -222,7 +223,7 @@ while (!($finished && $i >= $len) && !$error && !$timeout_passed) {
} }
} }
// Change delimiter, if redefined, and skip it (don't send to server!) // Change delimiter, if redefined, and skip it (don't send to server!)
if ((substr($buffer, $i, 9) == "DELIMITER") && ($buffer[$i + 9] <= ' ') && ($i<$len-11) && (!(strpos($buffer,"\n",$i+11)===FALSE))) { if ((strtoupper(substr($buffer, $i, 9)) == "DELIMITER") && ($buffer[$i + 9] <= ' ') && ($i<$len-11) && (!(strpos($buffer,"\n",$i+11)===FALSE))) {
$new_line_pos = strpos($buffer, "\n", $i + 10); $new_line_pos = strpos($buffer, "\n", $i + 10);
$sql_delimiter = substr($buffer, $i+10, $new_line_pos - $i -10); $sql_delimiter = substr($buffer, $i+10, $new_line_pos - $i -10);
$i= $new_line_pos + 1; $i= $new_line_pos + 1;