diff options
| author | igor@rurik.mysql.com <> | 2006-04-20 22:34:37 -0700 |
|---|---|---|
| committer | igor@rurik.mysql.com <> | 2006-04-20 22:34:37 -0700 |
| commit | fd3e9241647e70139a44baca9be5e336bc22e6da (patch) | |
| tree | 2f66ba0fb24347751f4ebdb657bf20d0c656bc27 /sql/sql_union.cc | |
| parent | 5109b3ce026d8202fd6bc806150f2bf0b1d95531 (diff) | |
| parent | fc7514151f9daf5af9df7abd7abb61574bdebc80 (diff) | |
| download | mariadb-git-fd3e9241647e70139a44baca9be5e336bc22e6da.tar.gz | |
Merge rurik.mysql.com:/home/igor/mysql-4.1
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
Diffstat (limited to 'sql/sql_union.cc')
| -rw-r--r-- | sql/sql_union.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_union.cc b/sql/sql_union.cc index 8bb53f7b573..0948602bbb4 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -184,7 +184,7 @@ int st_select_lex_unit::prepare(THD *thd_arg, select_result *sel_result, thd_arg->lex->current_select= sl= first_select= first_select_in_union(); found_rows_for_union= first_select->options & OPTION_FOUND_ROWS; - is_union= test(first_select->next_select()); + is_union= test(first_select->next_select() || fake_select_lex); /* Global option */ |