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

bug #2941101 import timeout when table already created and several data lines

Browse Source
This commit is contained in:
Marc Delisle
2010-01-31 16:42:06 +00:00
parent b0a6ad4dd6
commit bc7722584e
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -94,6 +94,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
3.2.6.0 (not yet released) 3.2.6.0 (not yet released)
- bug #2938492 [display] information_schema sorting order - bug #2938492 [display] information_schema sorting order
- bug #2941101 [import] import timeout when table already created and
several data lines
3.2.5.0 (2010-01-10) 3.2.5.0 (2010-01-10)
- patch #2903400 [bookmarks] Status of bookmark table, - patch #2903400 [bookmarks] Status of bookmark table,

6
import.php
View File

@@ -433,7 +433,11 @@ if (isset($message)) {
} }
// Parse and analyze the query, for correct db and table name // Parse and analyze the query, for correct db and table name
// in case of a query typed in the query window // in case of a query typed in the query window
require_once './libraries/parse_analyze.lib.php'; // (but if the query is too large, in case of an imported file, the parser
// can choke on it so avoid parsing)
if (strlen($sql_query) <= $GLOBALS['cfg']['MaxCharactersInDisplayedSQL']) {
require_once './libraries/parse_analyze.lib.php';
}
// There was an error? // There was an error?
if (isset($my_die)) { if (isset($my_die)) {