Another attempt to fix bug mdev-10785 + cleanup for the previous attempt.

1 files changed, 1 insertions, 8 deletions

diff --git a/sql/sql_derived.cc b/sql/sql_derived.cc
index 677a4c4d91a..85a85b9c3b2 100644
--- a/sql/sql_derived.cc
+++ b/sql/sql_derived.cc
@@ -1242,18 +1242,11 @@ bool pushdown_cond_for_derived(THD *thd, Item *cond, TABLE_LIST *derived)
                          (uchar*) sl);
     if (!extracted_cond_copy)
       continue;
-    /*
-      Create the conjunction of the existing having condition of sl
-      and the pushed condition, take it as the new having condition of sl
-      and fix this new condition
-    */
+
     extracted_cond_copy->walk(&Item::cleanup_processor, 0, 0);
     sl->cond_pushed_into_having= extracted_cond_copy;
   }
   thd->lex->current_select= save_curr_select;
   return false;
-err:
-  thd->lex->current_select= save_curr_select;
-  return true;
 }