Skip to content

Commit a96f1ae

Browse files
committed
Merge 11.4 into 11.8 (Q2 2026 release)
Null-merge MDEV-39240 (as if removed by MDEV-32188). MDEV-39240 fixed a replication compatibility issue with 32-bit unsigned timestamps that only existed because MDEV-32188 was a preview feature in 11.4. In 11.8, MDEV-32188 is fully released and stable, so MDEV-39240 is inapplicable and excluded.
2 parents d3767f9 + 0d9db6b commit a96f1ae

3 files changed

Lines changed: 14 additions & 2 deletions

File tree

libmariadb

sql/sp_instr.cc

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -534,7 +534,19 @@ int sp_lex_keeper::validate_lex_and_exec_core(THD *thd, uint *nextp,
534534
m_first_execution= false;
535535

536536
if (!rc)
537+
{
538+
/*
539+
sp_lex_instr is re-parsed after the metadata change, which sets up a new
540+
mem_root for reparsing. Once the sp_lex_instr is reparsed and re-executed
541+
(via reset_lex_and_exec_core) it should be marked as read-only to enforce
542+
sp memory root protection.
543+
*/
544+
#ifdef PROTECT_STATEMENT_MEMROOT
545+
if (rerun_the_same_instr && instr->mem_root)
546+
instr->mem_root->flags |= ROOT_FLAG_READ_ONLY;
547+
#endif
537548
break;
549+
}
538550

539551
/*
540552
Raise the error upper level in case:

storage/columnstore/columnstore

Submodule columnstore updated 9454 files

0 commit comments

Comments
 (0)