diff --git a/storage/maria/ma_bitmap.c b/storage/maria/ma_bitmap.c
index f75df06cadc..cec7cd782be 100644
--- a/storage/maria/ma_bitmap.c
+++ b/storage/maria/ma_bitmap.c
@@ -365,8 +365,8 @@ my_bool _ma_bitmap_flush_all(MARIA_SHARE *share)
     */
     if (bitmap->changed)
     {
-      res= write_changed_bitmap(share, bitmap);
       bitmap->changed= FALSE;
+      res= write_changed_bitmap(share, bitmap);
     }
     /*
       We do NOT use FLUSH_KEEP_LAZY because we must be sure that bitmap
diff --git a/storage/maria/ma_checkpoint.c b/storage/maria/ma_checkpoint.c
index 6d1a6332c54..8a6e2b5d960 100644
--- a/storage/maria/ma_checkpoint.c
+++ b/storage/maria/ma_checkpoint.c
@@ -827,7 +827,6 @@ static int collect_tables(LEX_STRING *str, LSN checkpoint_start_log_horizon)
         not seen again in the loop.
       */
       share->in_checkpoint= MARIA_CHECKPOINT_LOOKS_AT_ME;
-      /** @todo avoid strlen() */
       total_names_length+= share->open_file_name.length;
     }
   }