diff options
| author | Weblate <noreply@weblate.org> | 2014-02-11 21:33:30 +0400 |
|---|---|---|
| committer | Weblate <noreply@weblate.org> | 2014-02-11 21:33:30 +0400 |
| commit | 23abcfbf475e803f3e800f8a4cbda16725e01e4c (patch) | |
| tree | 317482030cf63ab33c35f9e9fc7125ae5bb4c46f | |
| parent | 4c0108cef8329f803cfd0be488f8ad747917ae3d (diff) | |
| parent | 9e53ca62b7e363cd190519e9483d1df431b3deaf (diff) | |
Merge remote-tracking branch 'origin/master'
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | libraries/sql.lib.php | 3 |
2 files changed, 3 insertions, 1 deletions
@@ -26,6 +26,7 @@ phpMyAdmin - ChangeLog 4.1.8.0 (not yet released) - bug #4276 Login loop on session expiry +- bug #4249 Incorrect number of result rows for SQL with subqueries 4.1.7.0 (2014-02-09) - bug #4245 initial Browse query does not match sorting order diff --git a/libraries/sql.lib.php b/libraries/sql.lib.php index c37fecb450..99f45eabc1 100644 --- a/libraries/sql.lib.php +++ b/libraries/sql.lib.php @@ -870,6 +870,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 { @@ -1387,7 +1388,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, |