diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-02-19 11:15:10 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-02-19 11:15:10 +0200 |
| commit | af6fdc13072cc310cf17fd3b28c749515d9c563c (patch) | |
| tree | 360cb2b83c7b736888afafc15d89a2b2665f5bc3 | |
| parent | ca76fc4a3a1c5f393e1e34005975582e73e84365 (diff) | |
| parent | 346e46089621e6951e076c82ed5690aa23dcb5fe (diff) | |
| download | mariadb-git-af6fdc13072cc310cf17fd3b28c749515d9c563c.tar.gz | |
Merge 10.1 into 10.2
| -rw-r--r-- | storage/maria/ma_delete.c | 2 | ||||
| -rw-r--r-- | storage/maria/ma_write.c | 3 | ||||
| -rw-r--r-- | storage/maria/maria_def.h | 4 |
3 files changed, 3 insertions, 6 deletions
diff --git a/storage/maria/ma_delete.c b/storage/maria/ma_delete.c index c5a2378dc2b..86e1ef0234b 100644 --- a/storage/maria/ma_delete.c +++ b/storage/maria/ma_delete.c @@ -695,9 +695,7 @@ static int del(MARIA_HA *info, MARIA_KEY *key, key_start= keypos; if (tmp_key.flag & (SEARCH_USER_KEY_HAS_TRANSID | SEARCH_PAGE_KEY_HAS_TRANSID)) - { _ma_mark_page_with_transid(share, anc_page); - } /* Save pointer to next leaf on parent page */ if (!(*keyinfo->get_key)(&ret_key, page_flag, share->base.key_reflength, diff --git a/storage/maria/ma_write.c b/storage/maria/ma_write.c index c4b2280c27d..47d2a5d7f9d 100644 --- a/storage/maria/ma_write.c +++ b/storage/maria/ma_write.c @@ -844,9 +844,8 @@ int _ma_insert(register MARIA_HA *info, MARIA_KEY *key, a_length+=t_length; if (key->flag & (SEARCH_USER_KEY_HAS_TRANSID | SEARCH_PAGE_KEY_HAS_TRANSID)) - { _ma_mark_page_with_transid(share, anc_page); - } + anc_page->size= a_length; page_store_size(share, anc_page); diff --git a/storage/maria/maria_def.h b/storage/maria/maria_def.h index c6b1d313c90..97409dcd77c 100644 --- a/storage/maria/maria_def.h +++ b/storage/maria/maria_def.h @@ -778,8 +778,8 @@ struct st_maria_handler transid_korr((buff) + LSN_STORE_SIZE) #define _ma_store_keypage_flag(share,x,flag) x[(share)->keypage_header - KEYPAGE_USED_SIZE - KEYPAGE_FLAG_SIZE]= (flag) #define _ma_mark_page_with_transid(share, page) \ - (page)->flag|= KEYPAGE_FLAG_HAS_TRANSID; \ - (page)->buff[(share)->keypage_header - KEYPAGE_USED_SIZE - KEYPAGE_FLAG_SIZE]= (page)->flag; + do { (page)->flag|= KEYPAGE_FLAG_HAS_TRANSID; \ + (page)->buff[(share)->keypage_header - KEYPAGE_USED_SIZE - KEYPAGE_FLAG_SIZE]= (page)->flag; } while (0) #define KEYPAGE_KEY_VERSION(share, x) ((x) + \ (share)->keypage_header - \ |