From c217c4867bcf3933f7d889a9eeb41902b9e19261 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 16 Jan 2004 20:05:08 +0200 Subject: 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. --- sql/sql_union.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'sql/sql_union.cc') 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; -- cgit v1.2.1