summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSeth Shelnutt <seth@tiledb.io>2019-11-04 16:17:59 -0500
committerAnel Husakovic <anel@mariadb.org>2019-11-21 22:01:50 +0100
commit01367a0f2c3bf1b6be3b1405a93685b32180ab6e (patch)
tree8ec9eb15835f23bee9be16fcd4fecaaf039ad602
parent6cedb671e99038f1a10e0d8504f835aaabed9780 (diff)
downloadmariadb-git-bb-10.4-anel-MDEV-20972.tar.gz
Remove use of or keyword MDEV-20972bb-10.4-anel-MDEV-20972
-rw-r--r--sql/item_subselect.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc
index 86c607fb894..79dcf8ecfe8 100644
--- a/sql/item_subselect.cc
+++ b/sql/item_subselect.cc
@@ -123,7 +123,7 @@ void Item_subselect::init(st_select_lex *select_lex,
NO_MATTER :
outer_select->parsing_place);
if (unit->is_unit_op() &&
- (unit->first_select()->next_select() or unit->fake_select_lex))
+ (unit->first_select()->next_select() || unit->fake_select_lex))
engine= new subselect_union_engine(unit, result, this);
else
engine= new subselect_single_select_engine(select_lex, result, this);