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

* fixed bug #480178 - select ... into outfile fails

Browse Source
This commit is contained in:
Loïc Chapeaux
2001-11-14 20:50:56 +00:00
parent 472a433a07
commit 82e87f4e1b
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql.php3
View File

@@ -167,12 +167,13 @@ else {
$cfgMaxRows = $sessionMaxRows; $cfgMaxRows = $sessionMaxRows;
} }
$is_explain = $is_select = $is_count = $is_delete = $is_insert = $is_affected = $is_show = $is_maint = FALSE; $is_explain = $is_select = $is_count = $is_export = $is_delete = $is_insert = $is_affected = $is_show = $is_maint = FALSE;
if (eregi('^EXPLAIN[[:space:]]+', $sql_query)) { if (eregi('^EXPLAIN[[:space:]]+', $sql_query)) {
$is_explain = TRUE; $is_explain = TRUE;
} else if (eregi('^SELECT[[:space:]]+', $sql_query)) { } else if (eregi('^SELECT[[:space:]]+', $sql_query)) {
$is_select = TRUE; $is_select = TRUE;
$is_count = (eregi('^SELECT COUNT\((.*\.+)?.*\)', $sql_query)); $is_count = (eregi('^SELECT COUNT\((.*\.+)?.*\)', $sql_query));
$is_export = (eregi(' INTO OUTFILE ', $sql_query));
} else if (eregi('^DELETE[[:space:]]+', $sql_query)) { } else if (eregi('^DELETE[[:space:]]+', $sql_query)) {
$is_delete = TRUE; $is_delete = TRUE;
$is_affected = TRUE; $is_affected = TRUE;
@@ -190,7 +191,7 @@ else {
// Do append a "LIMIT" clause? // Do append a "LIMIT" clause?
if (isset($pos) if (isset($pos)
&& (!$cfgShowAll || $sessionMaxRows != 'all') && (!$cfgShowAll || $sessionMaxRows != 'all')
&& ($is_select && !$is_count && eregi(' FROM ', $sql_query)) && ($is_select && !($is_count || $is_export) && eregi(' FROM ', $sql_query))
&& !eregi(' LIMIT[ 0-9,]+$', $sql_query)) { && !eregi(' LIMIT[ 0-9,]+$', $sql_query)) {
$sql_limit_to_append = " LIMIT $pos, $cfgMaxRows"; $sql_limit_to_append = " LIMIT $pos, $cfgMaxRows";
if (eregi('(.*)( PROCEDURE (.*)| FOR UPDATE| LOCK IN SHARE MODE)$', $sql_query, $regs)) { if (eregi('(.*)( PROCEDURE (.*)| FOR UPDATE| LOCK IN SHARE MODE)$', $sql_query, $regs)) {