diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-12-03 08:12:47 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-12-03 08:12:47 +0200 |
| commit | a13fac9eeef0f304b6b6f52ad2b6659f22190523 (patch) | |
| tree | 7bbcbe8765354f03142a005198276cadbfac6b20 /include/my_sys.h | |
| parent | e28d9c15c3093612d841b24b5bb6b480c9b8009c (diff) | |
| parent | f146969fb3a1e8ed508f55ee38faaffd5cff2021 (diff) | |
| download | mariadb-git-a13fac9eeef0f304b6b6f52ad2b6659f22190523.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'include/my_sys.h')
| -rw-r--r-- | include/my_sys.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/my_sys.h b/include/my_sys.h index 834a828c43a..3f21a43f035 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -877,7 +877,6 @@ extern void my_free_lock(void *ptr); #define my_malloc_lock(A,B) my_malloc(PSI_INSTRUMENT_ME, (A),(B)) #define my_free_lock(A) my_free((A)) #endif -#define root_name(A) "" #define alloc_root_inited(A) ((A)->min_malloc != 0) #define ALLOC_ROOT_MIN_BLOCK_SIZE (MALLOC_OVERHEAD + sizeof(USED_MEM) + 8) #define clear_alloc_root(A) do { (A)->free= (A)->used= (A)->pre_alloc= 0; (A)->min_malloc=0;} while(0) |