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

patch #2915168 [import] Incorrect parsing of DELIMITER keyword

Browse Source
This commit is contained in:
Marc Delisle
2009-12-17 17:54:53 +00:00
parent 90c5ef65cd
commit 936472a758
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -56,6 +56,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
- bug #2910568 [structure] Table size for ARCHIVE tables is not displayed - bug #2910568 [structure] Table size for ARCHIVE tables is not displayed
- patch #2899969 [core] Session lock blocks working from a second window, - patch #2899969 [core] Session lock blocks working from a second window,
thanks to Greg Roach - fisharebest thanks to Greg Roach - fisharebest
- patch #2915168 [import] Incorrect parsing of DELIMITER keyword,
thanks to Greg Roach - fisharebest
3.2.4.0 (2009-12-02) 3.2.4.0 (2009-12-02)
- bug [engines] Innodb_buffer_pool_pages_latched no longer returned in status - bug [engines] Innodb_buffer_pool_pages_latched no longer returned in status

2
libraries/import/sql.php
View File

@@ -118,7 +118,7 @@ while (!($GLOBALS['finished'] && $i >= $len) && !$error && !$timeout_passed) {
$old_i = $i; $old_i = $i;
// this is about 7 times faster that looking for each sequence i // this is about 7 times faster that looking for each sequence i
// one by one with strpos() // one by one with strpos()
if (preg_match('/(\'|"|#|-- |\/\*|`|(?i)' . $delimiter_keyword . ')/', $buffer, $matches, PREG_OFFSET_CAPTURE, $i)) { if (preg_match('/(\'|"|#|-- |\/\*|`|(?i)(?<![A-Z0-9_])' . $delimiter_keyword . ')/', $buffer, $matches, PREG_OFFSET_CAPTURE, $i)) {
// in $matches, index 0 contains the match for the complete // in $matches, index 0 contains the match for the complete
// expression but we don't use it // expression but we don't use it
$first_position = $matches[1][1]; $first_position = $matches[1][1];