Permalink
Browse files

bug fix 4249

Signed-off-by: Sampath Liyanage <plbsam@gmail.com>
  • Loading branch information...
1 parent 59e3c94 commit b6cd8cdb33741c9cf8f7c36b01c57fc9ed9f0c44 @sampathLiyanage sampathLiyanage committed Feb 8, 2014
Showing with 2 additions and 1 deletion.
  1. +2 −1 libraries/sql.lib.php
View
@@ -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,

0 comments on commit b6cd8cd

Please sign in to comment.