Bug#35785452: Table value constructor in subquery: Assertion

`!sl->order_list.first' failed.

Redundant ORDER BY clauses in table value constructors are not removed
during resolving. This could lead to assertions when transforming IN
subqueries or quantified comparisons, as the code expects redundant
ORDER BY clauses to have been removed before the transformation is
performed.

Fixed by adding a call to remove_redundant_subquery_clauses() while
resolving table value constructors in subqueries.

Change-Id: Ia8e33cf0d8dcacc62ec53a1a4f6cbb5c9a535f21

Author: kahatlen

mysql-test/r/table_value_constructor.result

@@ -770,3 +770,14 @@ SELECT * FROM t WHERE a IN (VALUES ROW(5), ROW(55), ROW(NULL));
 a	b
 5	6
 DROP TABLE t;
+#
+# Bug#35785452: Table value constructor in subquery:
+#               Assertion `!sl->order_list.first' failed.
+#
+CREATE TABLE t(x INT);
+INSERT INTO t VALUES (1), (2), (3), (4);
+SELECT * FROM t WHERE x >= ALL (VALUES ROW(2), ROW(3) ORDER BY column_0);
+x
+3
+4
+DROP TABLE t;

mysql-test/t/table_value_constructor.test

@@ -557,3 +557,14 @@ ANALYZE TABLE t;
 --eval EXPLAIN FORMAT=TREE $query
 --eval $query
 DROP TABLE t;
+
+--echo #
+--echo # Bug#35785452: Table value constructor in subquery:
+--echo #               Assertion `!sl->order_list.first' failed.
+--echo #
+
+CREATE TABLE t(x INT);
+INSERT INTO t VALUES (1), (2), (3), (4);
+--sorted_result
+SELECT * FROM t WHERE x >= ALL (VALUES ROW(2), ROW(3) ORDER BY column_0);
+DROP TABLE t;

sql/sql_lex.h

@@ -2242,8 +2242,7 @@ class Query_block : public Query_term {
   bool setup_group(THD *thd);
   void fix_after_pullout(Query_block *parent_query_block,
                          Query_block *removed_query_block);
-  bool remove_redundant_subquery_clauses(THD *thd,
-                                         int hidden_group_field_count);
+  bool remove_redundant_subquery_clauses(THD *thd);
   void repoint_contexts_of_join_nests(mem_root_deque<Table_ref *> join_list);
   bool empty_order_list(Query_block *sl);
   bool setup_join_cond(THD *thd, mem_root_deque<Table_ref *> *tables,

sql/sql_resolver.cc

@@ -392,8 +392,7 @@ bool Query_block::prepare(THD *thd, mem_root_deque<Item *> *insert_field_list) {
   if (unit->item &&                           // 1)
       !thd->lex->is_view_context_analysis())  // 2)
   {
-    if (remove_redundant_subquery_clauses(thd, hidden_group_field_count))
-      return true;
+    if (remove_redundant_subquery_clauses(thd)) return true;
   }
 
   /*
@@ -705,6 +704,11 @@ bool Query_block::prepare_values(THD *thd) {
 
   if (resolve_limits(thd)) return true;
 
+  // If this is a subquery, remove redundant clauses (ORDER BY in particular).
+  if (unit->item != nullptr && !thd->lex->is_view_context_analysis()) {
+    if (remove_redundant_subquery_clauses(thd)) return true;
+  }
+
   return false;
 }
 
@@ -3834,13 +3838,10 @@ void Query_block::merge_contexts(Query_block *inner) {
    for regular queries and on first execution of SP/PS
 
    @param thd               thread handler
-   @param hidden_group_field_count Number of hidden group fields added
-                            by setup_group().
    @return true on error
 */
 
-bool Query_block::remove_redundant_subquery_clauses(
-    THD *thd, int hidden_group_field_count) {
+bool Query_block::remove_redundant_subquery_clauses(THD *thd) {
   Item_subselect *subq_predicate = master_query_expression()->item;
   enum change {
     REMOVE_NONE = 0,