From b6cd8cdb33741c9cf8f7c36b01c57fc9ed9f0c44 Mon Sep 17 00:00:00 2001 From: Sampath Liyanage Date: Sat, 8 Feb 2014 22:24:03 +0530 Subject: [PATCH] bug fix 4249 Signed-off-by: Sampath Liyanage --- libraries/sql.lib.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libraries/sql.lib.php b/libraries/sql.lib.php index 811a8e4309..a4d6e1c8ef 100644 --- a/libraries/sql.lib.php +++ b/libraries/sql.lib.php @@ -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,