Merge 10.1 into 10.2

Author: dr-m

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,

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);
 

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 - \