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

Merge remote-tracking branch 'origin/QA_4_1' into QA_4_1

Browse Source
This commit is contained in:
Weblate 2014-02-11 18:28:38 +01:00
commit 7a5296bd43
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libraries/sql.lib.php
View File

@ -875,6 +875,7 @@ function PMA_isJustBrowsing($analyzed_sql_results, $find_real_end)
&& (empty($analyzed_sql_results['analyzed_sql'][0]['where_clause'])
|| $analyzed_sql_results['analyzed_sql'][0]['where_clause'] == '1 ')
&& ! isset($find_real_end)
&& !$analyzed_sql_results['is_subquery']
) {
return true;
} else {
@ -1392,7 +1393,7 @@ function PMA_countQueryResults(
// "Showing rows..." message
// $_SESSION['tmpval']['max_rows'] = 'all';
$unlim_num_rows = $num_rows;
} elseif ($is_select) {
} elseif ($is_select || $analyzed_sql_results['is_subquery']) {
// c o u n t q u e r y
// If we are "just browsing", there is only one table,