Merge branch 'mysql-8.0' into mysql-trunk

Author: Chaithra Gopalareddy

mysql-test/r/group_by.result

@@ -4308,3 +4308,12 @@ HEX(CONCAT(MIN(b1)))	HEX(CONCAT(MIN(b9)))	HEX(CONCAT(MIN(b64)))
 00	0000	0000000000000000
 01	0100	8000000000000000
 DROP TABLE t1;
+#
+# Bug#33515752: Data insertion exception in version 8.0.27
+#
+CREATE TABLE t1(f1 INTEGER);
+INSERT INTO t1 VALUES(1);
+SELECT SQL_BUFFER_RESULT MAX(f1)+1, 1 AS f2  FROM t1 GROUP BY f2;
+MAX(f1)+1	f2
+2	1
+DROP TABLE t1;

mysql-test/t/group_by.test

@@ -3254,3 +3254,14 @@ SELECT HEX(CONCAT(MIN(b1))), HEX(CONCAT(MIN(b9))), HEX(CONCAT(MIN(b64))) FROM t1
 SELECT HEX(CONCAT(MIN(b1))), HEX(CONCAT(MIN(b9))), HEX(CONCAT(MIN(b64))) FROM t1 IGNORE INDEX(i1) GROUP BY id;
 
 DROP TABLE t1;
+
+--echo #
+--echo # Bug#33515752: Data insertion exception in version 8.0.27
+--echo #
+
+CREATE TABLE t1(f1 INTEGER);
+INSERT INTO t1 VALUES(1);
+
+SELECT SQL_BUFFER_RESULT MAX(f1)+1, 1 AS f2  FROM t1 GROUP BY f2;
+
+DROP TABLE t1;

sql/iterators/composite_iterators.cc

@@ -203,7 +203,8 @@ bool AggregateIterator::Init() {
   //
   // This is a hack. It would be good to get rid of the slice system altogether
   // (the hypergraph join optimizer does not use it).
-  if (!m_join->implicit_grouping && !thd()->lex->using_hypergraph_optimizer) {
+  if (!(m_join->implicit_grouping || m_join->group_optimized_away) &&
+      !thd()->lex->using_hypergraph_optimizer) {
     m_output_slice = m_join->get_ref_item_slice();
   }