Merge branch 'mysql-8.0' into mysql-8.4

Author: Chaithra Gopalareddy

mysql-test/r/olap.result

@@ -2394,3 +2394,10 @@ CREATE TABLE t1(f1 INTEGER);
 SELECT SUM(TAN(0)) OVER() FROM t1 GROUP BY TAN(0) WITH ROLLUP;
 SUM(TAN(0)) OVER()
 DROP TABLE t1;
+#
+# Bug#36804785: `false' in operator at sql/sql_executor.cc
+#
+CREATE TABLE t1(f1 INTEGER);
+SELECT SUM(UTC_DATE()) OVER() FROM t1 GROUP BY UTC_DATE() WITH ROLLUP;
+SUM(UTC_DATE()) OVER()
+DROP TABLE t1;

mysql-test/t/olap.test

@@ -1338,3 +1338,11 @@ DROP TABLE t1;
 CREATE TABLE t1(f1 INTEGER);
 SELECT SUM(TAN(0)) OVER() FROM t1 GROUP BY TAN(0) WITH ROLLUP;
 DROP TABLE t1;
+
+--echo #
+--echo # Bug#36804785: `false' in operator at sql/sql_executor.cc
+--echo #
+
+CREATE TABLE t1(f1 INTEGER);
+SELECT SUM(UTC_DATE()) OVER() FROM t1 GROUP BY UTC_DATE() WITH ROLLUP;
+DROP TABLE t1;

sql/sql_executor.cc

@@ -4322,7 +4322,7 @@ static bool replace_embedded_rollup_references_with_tmp_fields(
     // A const item that is part of group by and not found in
     // select list will not be found in "fields" (It's not added
     // as a hidden item).
-    if (unwrap_rollup_group(sub_item)->const_item()) {
+    if (unwrap_rollup_group(sub_item)->const_for_execution()) {
       return {ReplaceResult::REPLACE, sub_item};
     }
     assert(false);