diff options
| author | unknown <Sinisa@sinisa.nasamreza.org> | 2004-01-16 20:05:08 +0200 |
|---|---|---|
| committer | unknown <Sinisa@sinisa.nasamreza.org> | 2004-01-16 20:05:08 +0200 |
| commit | c217c4867bcf3933f7d889a9eeb41902b9e19261 (patch) | |
| tree | a3a923141e8d5eced121b526394773aa8e5ea3e2 /sql/sql_union.cc | |
| parent | 306a903b3776f5aaf43318a6d1eef6c31f015cac (diff) | |
| download | mariadb-git-c217c4867bcf3933f7d889a9eeb41902b9e19261.tar.gz | |
Two bug fixes
mysql-test/t/mysqldump.test:
Fixing a test to encompass latest Jani's patch to mysqldump.c
sql/sql_union.cc:
Fix for the unlock problem with a typo correction.
Diffstat (limited to 'sql/sql_union.cc')
| -rw-r--r-- | sql/sql_union.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_union.cc b/sql/sql_union.cc index 25620229844..cdf8173e1b3 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -145,8 +145,9 @@ 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 | SELECT_NO_UNLOCK, + sl->options | thd_arg->options, tmp_result); thd_arg->lex->current_select= sl; offset_limit_cnt= sl->offset_limit; |