Merge bk-internal.mysql.com:/home/bk/mysql-maria

into  mysql.com:/home/my/mysql-maria


storage/maria/ma_blockrec.c:
  Auto merged
storage/maria/maria_read_log.c:
  Auto merged

sql/sql_yacc.yy

@@ -4280,7 +4280,7 @@ row_types:
 	| DYNAMIC_SYM	{ $$= ROW_TYPE_DYNAMIC; }
 	| COMPRESSED_SYM { $$= ROW_TYPE_COMPRESSED; }
 	| REDUNDANT_SYM	{ $$= ROW_TYPE_REDUNDANT; }
-	| COMPACT_SYM	{ $$= ROW_TYPE_COMPACT; };
+	| COMPACT_SYM	{ $$= ROW_TYPE_COMPACT; }
 	| PAGE_SYM	{ $$= ROW_TYPE_PAGE; };
 
 merge_insert_types:

storage/maria/ma_bitmap.c

@@ -296,7 +296,7 @@ void _ma_bitmap_delete_all(MARIA_SHARE *share)
   {
     bzero(bitmap->map, share->block_size);
     memcpy(bitmap->map + share->block_size - 2, maria_bitmap_marker, 2);
-    bitmap->changed= 0;
+    bitmap->changed= 1;
     bitmap->page= 0;
     bitmap->used_size= bitmap->total_size;
   }

storage/maria/ma_blockrec.h

@@ -178,3 +178,11 @@ my_bool _ma_check_if_right_bitmap_type(MARIA_HA *info,
                                        ulonglong page,
                                        uint *bitmap_pattern);
 void _ma_bitmap_delete_all(MARIA_SHARE *share);
+uint _ma_apply_redo_insert_row_head_or_tail(MARIA_HA *info, LSN lsn,
+                                            uint page_type,
+                                            const byte *header,
+                                            const byte *data,
+                                            size_t data_length);
+uint _ma_apply_redo_purge_row_head_or_tail(MARIA_HA *info, LSN lsn,
+                                           uint page_type,
+                                           const byte *header);

storage/maria/ma_loghandler.h

@@ -62,7 +62,7 @@ struct st_maria_share;
 #define pagerange_store(T,A) int2store(T,A)
 #define fileid_korr(P) uint2korr(P)
 #define page_korr(P)   uint5korr(P)
-#define dirpos_korr(P) (P[0])
+#define dirpos_korr(P) ((P)[0])
 #define pagerange_korr(P) uint2korr(P)
 
 /*

storage/maria/ma_loghandler_lsn.h

@@ -45,7 +45,7 @@ typedef TRANSLOG_ADDRESS LSN;
 #define LSN_OFFSET(L) ((L) & 0xFFFFFFFFL)
 
 /* Makes lsn/log address from file number and record offset */
-#define MAKE_LSN(F,S) ((((uint64)(F)) << 32) | (S))
+#define MAKE_LSN(F,S) ((LSN) ((((uint64)(F)) << 32) | (S)))
 
 /* checks LSN */
 #define LSN_VALID(L)                                    \