diff options
| author | unknown <serg@serg.mylan> | 2004-03-23 14:43:24 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2004-03-23 14:43:24 +0100 |
| commit | c0a9df1aaedc4a44299398b858021d49ccbfd2ea (patch) | |
| tree | 303d154fcdcdeb732e85c89c418f9b45836d801e /sql/sql_lex.cc | |
| parent | 78b4ba746b79ea7d89044e3eecd56338a8f4eb6f (diff) | |
| download | mariadb-git-c0a9df1aaedc4a44299398b858021d49ccbfd2ea.tar.gz | |
correct support for a mix of UNION/UNION ALL in the same query.
Bug#1428
Diffstat (limited to 'sql/sql_lex.cc')
| -rw-r--r-- | sql/sql_lex.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index 757eb4fdc7d..914834a75bc 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -997,7 +997,7 @@ void st_select_lex_unit::init_query() global_parameters= first_select(); select_limit_cnt= HA_POS_ERROR; offset_limit_cnt= 0; - union_option= 0; + union_distinct= 0; prepared= optimized= executed= 0; item= 0; union_result= 0; @@ -1572,7 +1572,7 @@ void st_select_lex_unit::print(String *str) if (sl != first_select()) { str->append(" union ", 7); - if (union_option & UNION_ALL) + if (!union_distinct) str->append("all ", 4); } if (sl->braces) |