Merge desktop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-maria

into  desktop.sanja.is.com.ua:/home/bell/mysql/bk/work-maria-filler

storage/maria/ma_bitmap.c

@@ -1176,6 +1176,7 @@ static my_bool find_blob(MARIA_HA *info, ulong length)
   MARIA_BITMAP_BLOCK *first_block= 0;
   DBUG_ENTER("find_blob");
   DBUG_PRINT("enter", ("length: %lu", length));
+  LINT_INIT(first_block_pos);
 
   pages= length / full_page_size;
   rest_length= (uint) (length - pages * full_page_size);
@@ -2007,6 +2008,9 @@ my_bool _ma_check_bitmap_data(MARIA_HA *info,
   case BLOB_PAGE:
     bits= FULL_TAIL_PAGE;
     break;
+  default:
+    bits= 0; /* to satisfy compiler */
+    DBUG_ASSERT(0);
   }
   return (*bitmap_pattern= get_page_bits(info, &info->s->bitmap, page)) !=
     bits;

storage/maria/ma_blockrec.c

@@ -5514,6 +5514,7 @@ my_bool _ma_apply_undo_row_update(MARIA_HA *info, LSN undo_lsn,
   MARIA_RECORD_POS record_pos;
   ha_checksum checksum_delta;
   DBUG_ENTER("_ma_apply_undo_row_update");
+  LINT_INIT(checksum_delta);
 
   page=  page_korr(header);
   header+= PAGE_STORE_SIZE;

storage/maria/ma_loghandler_lsn.h

@@ -83,7 +83,7 @@ typedef LSN LSN_WITH_FLAGS;
 
 #define FILENO_IMPOSSIBLE     0 /**< log file's numbering starts at 1 */
 #define LOG_OFFSET_IMPOSSIBLE 0 /**< log always has a header */
-#define LSN_IMPOSSIBLE        0
+#define LSN_IMPOSSIBLE        0L
 /* following LSN also is impossible */
 #define LSN_ERROR             1