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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2013-06-21 20:09:02 +02:00
commit 529f3408b4
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libraries/parse_analyze.inc.php
View File

@ -87,8 +87,7 @@ if ($GLOBALS['cfg']['RememberSorting']
}
// checks whether a LIMIT clause should be added to the query
if (($_SESSION['tmp_user_values']['max_rows'] != 'all')
&& ! ($is_count || $is_export || $is_func || $is_analyse)
if (! ($is_count || $is_export || $is_func || $is_analyse)
&& isset($analyzed_sql[0]['queryflags']['select_from'])
&& ! isset($analyzed_sql[0]['queryflags']['offset'])
&& empty($analyzed_sql[0]['limit_clause'])

4
sql.php
View File

@ -319,7 +319,9 @@ if ($is_remember_sorting_order) {
$sql_limit_to_append = '';
// Do append a "LIMIT" clause?
if ($is_append_limit_clause) {
if (($_SESSION['tmp_user_values']['max_rows'] != 'all')
&& $is_append_limit_clause
) {
$sql_limit_to_append = ' LIMIT ' . $_SESSION['tmp_user_values']['pos']
. ', ' . $_SESSION['tmp_user_values']['max_rows'] . " ";
$full_sql_query = PMA_getSqlWithLimitClause(