diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-03-11 20:09:34 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-03-11 20:09:34 +0200 |
| commit | a4b7232b2cfd504057c26f9b40a2dacf064dca73 (patch) | |
| tree | 9a33e1d13f7b7b716da89fe41f3ffdd3bf6221ba /storage/maria/ma_bitmap.c | |
| parent | a8650b64ede7330e83e84226cccd77ba8e05fa29 (diff) | |
| parent | 1ea6ac3c953f847da033254d5df67f57987a1884 (diff) | |
| download | mariadb-git-a4b7232b2cfd504057c26f9b40a2dacf064dca73.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'storage/maria/ma_bitmap.c')
| -rw-r--r-- | storage/maria/ma_bitmap.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/storage/maria/ma_bitmap.c b/storage/maria/ma_bitmap.c index bf0f97984a7..49604fa43f6 100644 --- a/storage/maria/ma_bitmap.c +++ b/storage/maria/ma_bitmap.c @@ -232,15 +232,16 @@ my_bool _ma_bitmap_init(MARIA_SHARE *share, File file, uint max_page_size; MARIA_FILE_BITMAP *bitmap= &share->bitmap; uint size= share->block_size; + myf flag= MY_WME | (share->temporary ? MY_THREAD_SPECIFIC : 0); pgcache_page_no_t first_bitmap_with_space; #ifndef DBUG_OFF /* We want to have a copy of the bitmap to be able to print differences */ size*= 2; #endif - if (!((bitmap->map= (uchar*) my_malloc(PSI_INSTRUMENT_ME, size, MYF(MY_WME)))) || + if (!((bitmap->map= (uchar*) my_malloc(PSI_INSTRUMENT_ME, size, flag))) || my_init_dynamic_array(PSI_INSTRUMENT_ME, &bitmap->pinned_pages, - sizeof(MARIA_PINNED_PAGE), 1, 1, MYF(0))) + sizeof(MARIA_PINNED_PAGE), 1, 1, flag)) return 1; bitmap->share= share; |