diff options
| author | unknown <igor@rurik.mysql.com> | 2006-04-21 00:36:20 -0700 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2006-04-21 00:36:20 -0700 |
| commit | 103fbcee45c0ea5517faf6904ff0b87b15312fbe (patch) | |
| tree | 12430c67bf33ee7014ca554819c453fb616380b5 /sql/sql_union.cc | |
| parent | db623fa89f9b90b21c00184400a1ca94c361010f (diff) | |
| parent | d4f4f5bdaf43b07036d89973ce247fe43009958f (diff) | |
| download | mariadb-git-103fbcee45c0ea5517faf6904ff0b87b15312fbe.tar.gz | |
Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
mysql-test/r/order_by.result:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
mysql-test/t/func_gconcat.test:
Manual merge
mysql-test/t/order_by.test:
Manual merge
sql/sql_lex.h:
Manual merge
sql/sql_parse.cc:
Manual merge
sql/sql_union.cc:
Manual merge
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 dee88af7d83..68036f76e96 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -202,7 +202,7 @@ bool st_select_lex_unit::prepare(THD *thd_arg, select_result *sel_result, thd_arg->lex->current_select= sl= first_sl; found_rows_for_union= first_sl->options & OPTION_FOUND_ROWS; - is_union= test(first_sl->next_select()); + is_union= test(first_select->next_select() || fake_select_lex); /* Global option */ |