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

Fix execution of single large queries.

Browse Source
This commit is contained in:
Michal Čihař
2005-10-08 13:28:07 +00:00
parent b8ebbe2aaa
commit db40959fd2
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -31,6 +31,7 @@ $Source$
over login, needed for RFE #1278312. over login, needed for RFE #1278312.
* Documentation.html: Add example for redirects like * Documentation.html: Add example for redirects like
/phpMyAdmin/database/table (RFE #1278312). /phpMyAdmin/database/table (RFE #1278312).
* libraries/import.lib.php: Fix execution of single large queries.
2005-10-07 Marc Delisle <lem9@users.sourceforge.net> 2005-10-07 Marc Delisle <lem9@users.sourceforge.net>
* libraries/check_user_privileges.lib.php: bug #1313821, dbname containing a * libraries/check_user_privileges.lib.php: bug #1313821, dbname containing a

7
libraries/import.lib.php
View File

@@ -88,6 +88,9 @@ function PMA_importRunQuery($sql = '', $full = '') {
if (!$sql_query_disabled) { if (!$sql_query_disabled) {
$complete_query = $sql_query; $complete_query = $sql_query;
$display_query = $sql_query; $display_query = $sql_query;
} else {
$complete_query = '';
$display_query = '';
} }
$sql_query = $import_run_buffer['sql']; $sql_query = $import_run_buffer['sql'];
} elseif ($run_query) { } elseif ($run_query) {
@@ -144,7 +147,8 @@ function PMA_importRunQuery($sql = '', $full = '') {
} }
} }
} }
// check length of query // check length of query unless we decided to pass it to sql.php
if (!$go_sql) {
if ($cfg['VerboseMultiSubmit'] && !empty($sql_query)) { if ($cfg['VerboseMultiSubmit'] && !empty($sql_query)) {
if (strlen($sql_query) > 50000 || $executed_queries > 50 || $max_sql_len > 1000) { if (strlen($sql_query) > 50000 || $executed_queries > 50 || $max_sql_len > 1000) {
$sql_query = ''; $sql_query = '';
@@ -156,6 +160,7 @@ function PMA_importRunQuery($sql = '', $full = '') {
$sql_query_disabled = TRUE; $sql_query_disabled = TRUE;
} }
} }
}
} // end do query (no skip) } // end do query (no skip)
} // end buffer exists } // end buffer exists