diff options
| author | igor@rurik.mysql.com <> | 2006-04-21 00:36:20 -0700 |
|---|---|---|
| committer | igor@rurik.mysql.com <> | 2006-04-21 00:36:20 -0700 |
| commit | 37ac7822065195d0bf7061d947306f2481c7191c (patch) | |
| tree | 12430c67bf33ee7014ca554819c453fb616380b5 /sql/sql_select.cc | |
| parent | 4cbad914ca5a4978e21e424f0c68cbb3185e0073 (diff) | |
| parent | fd3e9241647e70139a44baca9be5e336bc22e6da (diff) | |
| download | mariadb-git-37ac7822065195d0bf7061d947306f2481c7191c.tar.gz | |
Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 0211539e784..47c5281b258 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -224,7 +224,7 @@ bool handle_select(THD *thd, LEX *lex, select_result *result, register SELECT_LEX *select_lex = &lex->select_lex; DBUG_ENTER("handle_select"); - if (select_lex->next_select()) + if (select_lex->next_select() || select_lex->master_unit()->fake_select_lex) res= mysql_union(thd, lex, result, &lex->unit, setup_tables_done_option); else { |