database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge branch '11.3' into 11.4

Browse Source
This commit is contained in:
Oleksandr Byelkin
2024-02-15 13:53:21 +01:00
parent 3ae6680eec 068a6819eb
commit fa69b085b1
400 changed files with 10554 additions and 2525 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_lex.cc
View File

@@ -4800,9 +4800,12 @@ void st_select_lex::fix_prepare_information(THD *thd, Item **conds,
{
Query_arena_stmt on_stmt_arena(thd);
changed_elements|= TOUCHED_SEL_COND;
/*
TODO: return after MDEV-33218 fix
DBUG_ASSERT(
active_arena->is_stmt_prepare_or_first_stmt_execute() ||
active_arena->state == Query_arena::STMT_SP_QUERY_ARGUMENTS);
*/
if (group_list.first)
{
if (!group_list_ptrs)