database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge branch '10.4' into 10.5

Browse Source
This commit is contained in:
Oleksandr Byelkin
2022-02-01 20:33:04 +01:00
parent fb40a2fabf c04a203a10
commit cf63eecef4
460 changed files with 9909 additions and 2408 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_prepare.cc
View File

@ -3040,7 +3040,6 @@ void reinit_stmt_before_use(THD *thd, LEX *lex)
}
for (; sl; sl= sl->next_select_in_list())
{
sl->parent_lex->in_sum_func= NULL;
if (sl->changed_elements & TOUCHED_SEL_COND)
{
/* remove option which was put by mysql_explain_union() */
@ -3175,6 +3174,7 @@ void reinit_stmt_before_use(THD *thd, LEX *lex)
lex->result->set_thd(thd);
}
lex->allow_sum_func.clear_all();
lex->in_sum_func= NULL;
DBUG_VOID_RETURN;
}
@ -4313,7 +4313,7 @@ bool Prepared_statement::prepare(const char *packet, uint packet_len)
Restore original values of variables modified on handling
SET STATEMENT clause.
*/
thd->lex->restore_set_statement_var();
error|= thd->lex->restore_set_statement_var();
/* The order is important */
lex->unit.cleanup();