mirror/php-adminer
1
0
Fork 0
mirror of https://github.com/vrana/adminer.git synced 2025-08-09 16:17:48 +02:00
Code Issues Releases Wiki Activity

MySQL: Display number of found rows in group queries (regression from 5.1.1)

Browse Source
This commit is contained in:
Jakub Vrana
2025-04-02 21:32:28 +02:00
parent 22dc4ff444
commit ce03585210
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -1,4 +1,5 @@
## Adminer dev ## Adminer dev
- MySQL: Display number of found rows in group queries (regression from 5.1.1)
## Adminer 5.1.1 (released 2025-04-02) ## Adminer 5.1.1 (released 2025-04-02)
- Export: Fix tar (regression from 5.0.3) - Export: Fix tar (regression from 5.0.3)

2
adminer/select.inc.php
View File

@@ -271,6 +271,7 @@ if (!$columns && support("table")) {
echo "</form>\n"; echo "</form>\n";
$page = $_GET["page"]; $page = $_GET["page"];
$found_rows = null;
if ($page == "last") { if ($page == "last") {
$found_rows = get_val(count_rows($TABLE, $where, $is_group, $group)); $found_rows = get_val(count_rows($TABLE, $where, $is_group, $group));
$page = floor(max(0, intval($found_rows) - 1) / $limit); $page = floor(max(0, intval($found_rows) - 1) / $limit);
@@ -487,7 +488,6 @@ if (!$columns && support("table")) {
if (!is_ajax()) { if (!is_ajax()) {
if ($rows || $page) { if ($rows || $page) {
$exact_count = true; $exact_count = true;
$found_rows = null;
if ($_GET["page"] != "last") { if ($_GET["page"] != "last") {
if (!$limit || (count($rows) < $limit && ($rows || !$page))) { if (!$limit || (count($rows) < $limit && ($rows || !$page))) {
$found_rows = ($page ? $page * $limit : 0) + count($rows); $found_rows = ($page ? $page * $limit : 0) + count($rows);