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 2014-01-20 18:52:56 +01:00
commit d4de917bc3
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -22,6 +22,7 @@ phpMyAdmin - ChangeLog
4.1.6.0 (not yet released)
- bug #4232 User not found after creating the user
- bug #4241 Confusing dialog when trying to create an already existing user
- bug #4239 Missing LIMIT clause for some queries
4.1.5.0 (2014-01-17)
- bug #3780 Allow aborting loading pages

4
libraries/sql.lib.php
View File

@ -832,9 +832,7 @@ function PMA_isAppendLimitClause($analyzed_sql_results)
$analyzed_sql_results['analyzed_sql'][0]['queryflags']['select_from']
);
if (($_SESSION['tmpval']['max_rows'] != 'all')
&& ! ($analyzed_sql_results['is_count']
|| $analyzed_sql_results['is_export']
|| $analyzed_sql_results['is_func']
&& ! ($analyzed_sql_results['is_export']
|| $analyzed_sql_results['is_analyse'])
&& $select_from
&& ! isset($analyzed_sql_results['analyzed_sql'][0]['queryflags']['offset'])