diff options
| author | unknown <bell@sanja.is.com.ua> | 2004-05-14 15:28:59 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2004-05-14 15:28:59 +0300 |
| commit | 8c0e5ebfd372a53cd6b2104c366ac4b6ac4a304b (patch) | |
| tree | eb012e1ffa7c670e4b583ea47303c6438fadffd9 /sql/sql_union.cc | |
| parent | a6b3433b1f8b8008692106c01fa705ab4848a296 (diff) | |
| download | mariadb-git-8c0e5ebfd372a53cd6b2104c366ac4b6ac4a304b.tar.gz | |
after merge fix
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 fe009f89e76..42a714aaded 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -120,7 +120,7 @@ bool select_union::flush() ulong st_select_lex_unit::init_prepare_fake_select_lex(THD *thd) { - ulong options_tmp= thd->options; + ulong options_tmp= thd->options | fake_select_lex->options; thd->lex->current_select= fake_select_lex; offset_limit_cnt= global_parameters->offset_limit; select_limit_cnt= global_parameters->select_limit + |