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_select.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_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 91fc808058f..46dba61cfc5 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -171,7 +171,7 @@ int 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); else res= mysql_select(thd, &select_lex->ref_pointer_array, |