mirror of
https://github.com/MariaDB/server.git
synced 2026-01-06 05:22:24 +03:00
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.
This commit is contained in:
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user