From e347b4677bf3ac016ca53c67cbfe5015f5d25707 Mon Sep 17 00:00:00 2001 From: Luca Date: Tue, 8 Jan 2019 19:33:14 +0100 Subject: [PATCH] Fix for MySQL 8 The keyword ROW became reserved in MySQL 8.0.2 https://dev.mysql.com/doc/refman/8.0/en/keywords.html#keywords-8-0-detailed-R --- functions.inc.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/functions.inc.php b/functions.inc.php index 01fc65b1..d8d523be 100644 --- a/functions.inc.php +++ b/functions.inc.php @@ -543,7 +543,7 @@ function create_page_browser($idxfield, $querypart) { } # init row counter - $initcount = "SET @row=-1"; + $initcount = "SET @r=-1"; if (db_pgsql()) { $initcount = "CREATE TEMPORARY SEQUENCE rowcount MINVALUE 0"; } @@ -555,8 +555,8 @@ function create_page_browser($idxfield, $querypart) { $page_size_zerobase = $page_size - 1; $query = " SELECT * FROM ( - SELECT $idxfield AS label, @row := @row + 1 AS 'row' $querypart - ) idx WHERE MOD(idx.row, $page_size) IN (0,$page_size_zerobase) OR idx.row = $count_results + SELECT $idxfield AS label, @r := @r + 1 AS 'r' $querypart + ) idx WHERE MOD(idx.r, $page_size) IN (0,$page_size_zerobase) OR idx.r = $count_results "; if (db_pgsql()) {