summaryrefslogtreecommitdiff
path: root/sql/item_subselect.h
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2017-05-09 13:24:52 +0200
committerSergei Golubchik <serg@mariadb.org>2017-05-09 13:24:52 +0200
commitc91ecf9e9bebf3cf2dafbd3193de4df94be09870 (patch)
treea9ab429c8e8a6a50c38557cbdd38d9612480f49c /sql/item_subselect.h
parent2645bda5f20ab10bc26dc1cb69f91b5505c1faae (diff)
parentc92168fcd26aad35bd4cb5d65175e3545133f201 (diff)
downloadmariadb-git-c91ecf9e9bebf3cf2dafbd3193de4df94be09870.tar.gz
Merge branch '10.1' into 10.2
Revert commit db0917f68f, because the fix for MDEV-12696 is coming from 5.5 and 10.1 in this merge.
Diffstat (limited to 'sql/item_subselect.h')
-rw-r--r--sql/item_subselect.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/sql/item_subselect.h b/sql/item_subselect.h
index 83bd9ed0bdf..72ea63612f0 100644
--- a/sql/item_subselect.h
+++ b/sql/item_subselect.h
@@ -724,6 +724,13 @@ public:
in_strategy= (SUBS_STRATEGY_CHOSEN | strategy);
DBUG_VOID_RETURN;
}
+
+ bool walk(Item_processor processor, bool walk_subquery, void *arg)
+ {
+ return left_expr->walk(processor, walk_subquery, arg) ||
+ Item_subselect::walk(processor, walk_subquery, arg);
+ }
+
bool exists2in_processor(void *opt_arg __attribute__((unused)))
{
return 0;