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

bug #1851833 [display] Sorting forgets an explicit LIMIT (fix for sorting on column headers)

Browse Source
This commit is contained in:
Marc Delisle
2007-12-16 15:57:09 +00:00
parent 78a3a6dacb
commit 96bd2a4978
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -38,6 +38,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
- bug #1817612 [cookies] Wrong cookie path on IIS with PHP-CGI, - bug #1817612 [cookies] Wrong cookie path on IIS with PHP-CGI,
thanks to Carsten Wiedmann thanks to Carsten Wiedmann
- bug #1848889 [export] export trigger should use DROP TRIGGER IF EXISTS - bug #1848889 [export] export trigger should use DROP TRIGGER IF EXISTS
- bug #1851833 [display] Sorting forgets an explicit LIMIT
(fix for sorting on column headers)
2.11.3.0 (2007-12-08) 2.11.3.0 (2007-12-08)
- patch #1818389 to remove a notice (failed to flush buffer), thanks to - patch #1818389 to remove a notice (failed to flush buffer), thanks to

4
libraries/sqlparser.lib.php
View File

@@ -1492,6 +1492,7 @@ if (! defined('PMA_MINIMUM_COMMON')) {
$in_limit = TRUE; $in_limit = TRUE;
$limit_clause = ''; $limit_clause = '';
$before_limit = FALSE; $before_limit = FALSE;
$in_order_by = FALSE; // @todo maybe others to set FALSE
} }
if ($upper_data == 'PROCEDURE') { if ($upper_data == 'PROCEDURE') {
@@ -1673,7 +1674,8 @@ if (! defined('PMA_MINIMUM_COMMON')) {
if (isset($subresult['queryflags']['select_from']) if (isset($subresult['queryflags']['select_from'])
&& $subresult['queryflags']['select_from'] == 1 && $subresult['queryflags']['select_from'] == 1
&& !$seen_order) { && ! $in_order_by
&& $upper_data != 'ORDER') {
$unsorted_query .= $arr[$i]['data']; $unsorted_query .= $arr[$i]['data'];
if ($arr[$i]['type'] != 'punct_bracket_open_round' if ($arr[$i]['type'] != 'punct_bracket_open_round'