diff options
| author | unknown <bell@sanja.is.com.ua> | 2003-10-28 12:45:37 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2003-10-28 12:45:37 +0200 |
| commit | 683dcaae6bfc101d352755f834ecda48f4ea4700 (patch) | |
| tree | 1088bf30fb5febda5000cffc7db8982c9e5d1257 /sql/mysql_priv.h | |
| parent | 87eb9ea2b10e5ae9d251444e9f3372b958f6a7ea (diff) | |
| parent | 47f3a4fd4aa4ac7f2944c85aa20333fa0259ac77 (diff) | |
| download | mariadb-git-683dcaae6bfc101d352755f834ecda48f4ea4700.tar.gz | |
merge
sql/item.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/item_sum.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 1926314cef1..e387711e1f0 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -199,6 +199,9 @@ extern CHARSET_INFO *national_charset_info, *table_alias_charset; #define OPTION_QUOTE_SHOW_CREATE OPTION_QUICK*2 #define OPTION_INTERNAL_SUBTRANSACTIONS OPTION_QUOTE_SHOW_CREATE*2 +/* options for UNION set by the yacc parser (stored in unit->union_option) */ +#define UNION_ALL 1 + /* Set if we are updating a non-transaction safe table */ #define OPTION_STATUS_NO_TRANS_UPDATE OPTION_INTERNAL_SUBTRANSACTIONS*2 |