Skip to content

MDEV-39418: Merge 11.4 into 11.8 - null-merge MDEV-39240 #4976

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
itzanway wants to merge 1 commit into
base: 11.8
Choose a base branch
from
+12 −0
Open

MDEV-39418: Merge 11.4 into 11.8 - null-merge MDEV-39240 #4976

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions sql/sp_instr.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -534,7 +534,19 @@ int sp_lex_keeper::validate_lex_and_exec_core(THD *thd, uint *nextp,
m_first_execution= false;

if (!rc)
{
/*
sp_lex_instr is re-parsed after the metadata change, which sets up a new
mem_root for reparsing. Once the sp_lex_instr is reparsed and re-executed
(via reset_lex_and_exec_core) it should be marked as read-only to enforce
sp memory root protection.
*/
#ifdef PROTECT_STATEMENT_MEMROOT
if (rerun_the_same_instr && instr->mem_root)
instr->mem_root->flags |= ROOT_FLAG_READ_ONLY;
#endif
break;
}

/*
Raise the error upper level in case:
Expand Down
Loading