diff options
| author | unknown <Sinisa@sinisa.nasamreza.org> | 2004-01-17 17:18:32 +0200 |
|---|---|---|
| committer | unknown <Sinisa@sinisa.nasamreza.org> | 2004-01-17 17:18:32 +0200 |
| commit | 2d6ff22e94aecf3ea6fb92544476b6a7ab961eff (patch) | |
| tree | 72589e0b1d8c77a4111a926bec21f635a6299667 /sql/sql_union.cc | |
| parent | aa35b8c1b155474bb8c5c4f7ded55a582ee8ad1e (diff) | |
| parent | c217c4867bcf3933f7d889a9eeb41902b9e19261 (diff) | |
| download | mariadb-git-2d6ff22e94aecf3ea6fb92544476b6a7ab961eff.tar.gz | |
merge fixes
Diffstat (limited to 'sql/sql_union.cc')
| -rw-r--r-- | sql/sql_union.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_union.cc b/sql/sql_union.cc index 260903c9dd1..1cb01c6b3ef 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -146,6 +146,7 @@ int st_select_lex_unit::prepare(THD *thd_arg, select_result *sel_result, for (;sl; sl= sl->next_select()) { + sl->options|= SELECT_NO_UNLOCK; JOIN *join= new JOIN(thd_arg, sl->item_list, sl->options | thd_arg->options | additional_options, tmp_result); |