summaryrefslogtreecommitdiff
path: root/sql/sql_lex.cc
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2023-01-13 10:18:30 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2023-01-13 10:18:30 +0200
commit73ecab3d26c055928673a2629f4513aa7008dbf0 (patch)
treeb04760b3369cd1d8fc03c7dec204f5a371335b29 /sql/sql_lex.cc
parent7d1df207c4ded0ac8aa61f0d35bcae7eda974c54 (diff)
parent71e8e4934db06c02db1b51716e9d4b3992505161 (diff)
downloadmariadb-git-73ecab3d26c055928673a2629f4513aa7008dbf0.tar.gz
Merge 10.4 into 10.5
Diffstat (limited to 'sql/sql_lex.cc')
-rw-r--r--sql/sql_lex.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc
index 4d5d417aabb..413cd0f18e7 100644
--- a/sql/sql_lex.cc
+++ b/sql/sql_lex.cc
@@ -10740,9 +10740,8 @@ st_select_lex::build_pushable_cond_for_having_pushdown(THD *thd, Item *cond)
*/
if (cond->get_extraction_flag() == FULL_EXTRACTION_FL)
{
- 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 &&