summaryrefslogtreecommitdiff
path: root/sql/sql_lex.h
diff options
context:
space:
mode:
authorOleksandr Byelkin <sanja@mariadb.com>2017-03-13 11:04:46 +0100
committerOleksandr Byelkin <sanja@mariadb.com>2017-03-13 11:04:46 +0100
commit4c31280c5bfdfc3a1fec177de563c61559efe9c0 (patch)
treefcc58f429a711e36df2bf47a29b8d90050d5bfe0 /sql/sql_lex.h
parent1e47dece126cfab481d81bda3eedf71c0e12119c (diff)
downloadmariadb-git-10.3-MDEV-10141.tar.gz
MDEV-10141 & MDEV-10140 : Postreview changes10.3-MDEV-10141
Diffstat (limited to 'sql/sql_lex.h')
-rw-r--r--sql/sql_lex.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h
index 3525e36aa5b..e2c6f4aaaaf 100644
--- a/sql/sql_lex.h
+++ b/sql/sql_lex.h
@@ -40,6 +40,7 @@ enum sub_select_type
UNION_TYPE, INTERSECT_TYPE, EXCEPT_TYPE,
GLOBAL_OPTIONS_TYPE, DERIVED_TABLE_TYPE, OLAP_TYPE
};
+enum unit_common_op {OP_MIX, OP_UNION, OP_INTERSECT, OP_EXCEPT};
/* These may not be declared yet */
class Table_ident;
class sql_exchange;
@@ -738,6 +739,7 @@ public:
select_unit *get_union_result() { return union_result; }
int save_union_explain(Explain_query *output);
int save_union_explain_part2(Explain_query *output);
+ unit_common_op common_op();
};
typedef class st_select_lex_unit SELECT_LEX_UNIT;