diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-13 13:39:13 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-13 13:39:13 +0000 |
| commit | 86fbb58c3ac0865482819c10a3e81f2eea001c36 (patch) | |
| tree | 28c9e526ea739c6f9b89e36115e1e2698bddf981 /include/my_alloc.h | |
| parent | Releasing progress-linux version 1:10.11.6-2~progress7.99u1. (diff) | |
| download | mariadb-86fbb58c3ac0865482819c10a3e81f2eea001c36.tar.xz mariadb-86fbb58c3ac0865482819c10a3e81f2eea001c36.zip | |
Merging upstream version 1:10.11.7.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'include/my_alloc.h')
| -rw-r--r-- | include/my_alloc.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/my_alloc.h b/include/my_alloc.h index caa4be8f..0b777437 100644 --- a/include/my_alloc.h +++ b/include/my_alloc.h @@ -25,6 +25,8 @@ #define ALLOC_MAX_BLOCK_TO_DROP 4096 #define ALLOC_MAX_BLOCK_USAGE_BEFORE_DROP 10 +#define ROOT_FLAG_READ_ONLY 4 + #ifdef __cplusplus extern "C" { #endif @@ -53,10 +55,6 @@ typedef struct st_mem_root unsigned short first_block_usage; unsigned short flags; -#ifdef PROTECT_STATEMENT_MEMROOT - int read_only; -#endif - void (*error_handler)(void); PSI_memory_key psi_key; |