diff options
author | Seth Shelnutt <seth@tiledb.io> | 2019-11-04 16:17:59 -0500 |
---|---|---|
committer | Anel Husakovic <anel@mariadb.org> | 2019-11-22 11:25:48 +0100 |
commit | cb6d7c3ee3e3e90ed46d3d1d58be6bac12e5f784 (patch) | |
tree | 8ec9eb15835f23bee9be16fcd4fecaaf039ad602 /sql/item_subselect.cc | |
parent | 6cedb671e99038f1a10e0d8504f835aaabed9780 (diff) | |
download | mariadb-git-cb6d7c3ee3e3e90ed46d3d1d58be6bac12e5f784.tar.gz |
MDEV-20972: `or` alterative operator breaking windows build
Closes #1405
Diffstat (limited to 'sql/item_subselect.cc')
-rw-r--r-- | sql/item_subselect.cc | 2 |
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); |