Merge commit 'f220ef2'

phpmyadmin · Apr 11, 2014 · 72f0507 · 72f0507
2 parents f46865c + f220ef2
commit 72f0507
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/libraries/sql.lib.php b/libraries/sql.lib.php
@@ -872,6 +872,8 @@ function PMA_isJustBrowsing($analyzed_sql_results, $find_real_end)
         && ! $table_name
         && (empty($analyzed_sql_results['analyzed_sql'][0]['where_clause'])
         || $analyzed_sql_results['analyzed_sql'][0]['where_clause'] == '1 ')
+        && (empty($analyzed_sql_results['analyzed_sql'][0]['group_by_clause'])
+        || $analyzed_sql_results['analyzed_sql'][0]['group_by_clause'] == '1 ')
         && ! isset($find_real_end)
         && !$analyzed_sql_results['is_subquery']
     ) {