followup: fix ASAN failure of main.having_cond_pushdown --ps

also call top_level_transform() recursively for (a OR b) AND (c OR d)
MariaDB · Oct 29, 2022 · 6414374 · 6414374
1 parent a472237
commit 6414374
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc
@@ -5246,7 +5246,7 @@ Item *Item_cond::top_level_transform(THD *thd, Item_transformer transformer, uch
   Item *item;
   while ((item= li++))
   {
-    Item *new_item= item->transform(thd, transformer, arg);
+    Item *new_item= item->top_level_transform(thd, transformer, arg);
     if (!new_item)
       return 0;
     *li.ref()= new_item;

diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc
@@ -10850,9 +10850,8 @@ st_select_lex::build_pushable_cond_for_having_pushdown(THD *thd, Item *cond)
   */
   if (cond->get_extraction_flag() == MARKER_FULL_EXTRACTION)
   {
-    Item *result= cond->transform(thd,
-                                  &Item::multiple_equality_transformer,
-                                  (uchar *)this);
+    Item *result= cond->top_level_transform(thd,
+                        &Item::multiple_equality_transformer, (uchar *)this);
     if (!result)
       return true;
     if (result->type() == Item::COND_ITEM &&