Bug#35443333 [backport] Hypergraph: regression for main.window_functions_bugs

Follow-up on Bug#35340987 Prepared SELECT returns different results on
 consecutive executions

The fix for Bug#35340987 did not work for the hypergraph optimizer
enabled since the compensatory code (calling update_used_tables of
this fields in the JOIN) was put in make_tmp_tables_info - unused with
hypergraph optimizer - hence never performed.

This patch moves that code to JOIN::optimize where it can be reached
by both optimizers. No new test is needed; just run

   ./mtr window_functions_bugs --hypergraph

to verify.

Change-Id: Ia5fd2fa5e09c001de2ac9b05155a061fd2b4e4e9

Author: Dag Wanvik

sql/sql_optimizer.cc

@@ -590,6 +590,12 @@ bool JOIN::optimize(bool finalize_access_paths) {
         m_windows_sort = true;
         break;
       }
+    // This is necessary to undo effects of any previous execute's call to
+    // CreateFramebufferTable->ReplaceMaterializedItems's calls of
+    // update_used_tables: loses PROP_WINDOW_FUNCTION needed here in next
+    // execution round
+    if (m_windows.elements > 0)
+      for (auto f : *fields) f->update_used_tables();
   }
 
   sort_by_table = get_sort_by_table(order.order, group_list.order,

sql/sql_select.cc

@@ -4390,13 +4390,6 @@ bool JOIN::make_tmp_tables_info() {
 
   DBUG_TRACE;
 
-  // This is necessary to undo effects of any previous execute's call to
-  // CreateFramebufferTable->ReplaceMaterializedItems's calls of
-  // update_used_tables: loses PROP_WINDOW_FUNCTION needed here in next
-  // execution round
-  if (m_windows.elements > 0)
-    for (auto f : *fields) f->update_used_tables();
-
   /*
     In this function, we may change having_cond into a condition on a
     temporary sort/group table, so we have to assign having_for_explain now: