diff options
| author | unknown <evgen@moonbone.local> | 2006-04-25 13:04:39 +0400 |
|---|---|---|
| committer | unknown <evgen@moonbone.local> | 2006-04-25 13:04:39 +0400 |
| commit | 08f930375b5b393362f744aacd29197bb7b6ea57 (patch) | |
| tree | 3fec1af8e114a3cc4505bed53230c19ce5c41b70 /sql/sql_union.cc | |
| parent | c984135242752a2bac8b32bbafcd8a45b2423121 (diff) | |
| parent | 6692dcf7185518743d9dabefd22ef569d90667e6 (diff) | |
| download | mariadb-git-08f930375b5b393362f744aacd29197bb7b6ea57.tar.gz | |
Manually merged
client/mysql.cc:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/func_gconcat.result:
Auto merged
mysql-test/t/rpl_relayrotate.test:
Auto merged
mysys/mf_keycache.c:
Auto merged
BitKeeper/deleted/.del-innodb_unsafe_binlog-master.opt~9cbe1bb3d8696c5b:
Auto merged
mysql-test/t/rpl_stm_until.test:
Auto merged
sql/item_func.cc:
Auto merged
sql/lock.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_union.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/unireg.h:
Auto merged
storage/ndb/src/kernel/SimBlockList.cpp:
Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp:
Auto merged
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 e80aaecfd64..3c156acfc14 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= first_sl->next_select() || fake_select_lex; /* Global option */ |