ORDER BY the inner query so the order is deterministic + It uses the INDEX

1 files changed, 6 insertions, 1 deletions

diff --git a/core/DataAccess/LogQueryBuilder.php b/core/DataAccess/LogQueryBuilder.php
index 132480514b..b062b91b3f 100644
--- a/core/DataAccess/LogQueryBuilder.php
+++ b/core/DataAccess/LogQueryBuilder.php
@@ -185,9 +185,14 @@ class LogQueryBuilder
         $innerFrom = $from;
         $innerWhere = $where;
         $innerGroupBy = "log_visit.idvisit";
-        $innerOrderBy = "NULL";
         $innerLimit = $limit;
 
+        $innerOrderBy = "NULL";
+        // Only when there is a LIMIT then we can apply to the inner query the same ORDER BY as the parent query
+        if($innerLimit) {
+            $innerOrderBy = $orderBy;
+        }
+
         $innerQuery = $this->buildSelectQuery($innerSelect, $innerFrom, $innerWhere, $innerGroupBy, $innerOrderBy, $innerLimit);
 
         $select = preg_replace('/'.$matchTables.'\./', 'log_inner.', $select);