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

Merge branch '10.4' into 10.5

Browse Source
This commit is contained in:
Dmitry Shulga
2023-09-05 12:41:49 +07:00
parent 59952b2625 d0a872c20e
commit 68a925b325
9 changed files with 210 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/my_alloc.h
View File

@@ -52,6 +52,10 @@ typedef struct st_mem_root
*/
unsigned int first_block_usage;
#ifdef PROTECT_STATEMENT_MEMROOT
int read_only;
#endif
void (*error_handler)(void);
PSI_memory_key m_psi_key;