diff --git a/storage/maria/ma_blockrec.c b/storage/maria/ma_blockrec.c
index 46fcb49d5c5..ac04eca4398 100644
--- a/storage/maria/ma_blockrec.c
+++ b/storage/maria/ma_blockrec.c
@@ -1515,10 +1515,10 @@ void _ma_compact_block_page(uchar *buff, uint block_size, uint rownr,
 
   if (rownr != max_entry - 1)
   {
-    DBUG_ASSERT(extend_block);
-
     /* Move all entries after rownr to end of page */
     uint rownr_length;
+
+    DBUG_ASSERT(extend_block);                  /* Should always be true */
     next_free_pos= end_of_found_block= page_pos=
       block_size - DIR_ENTRY_SIZE * max_entry - PAGE_SUFFIX_SIZE;
     diff= 0;
diff --git a/support-files/compiler_warnings.supp b/support-files/compiler_warnings.supp
index 5039c28aab0..41ebf1bcf8a 100644
--- a/support-files/compiler_warnings.supp
+++ b/support-files/compiler_warnings.supp
@@ -127,6 +127,8 @@ storage/maria/ma_pagecache.c: .*'info_check_pin' defined but not used
 # Pbxt
 #
 xaction_xt\.cc: may be used uninitialized in this function
+lock_xt\.cc : uninitialized local variable .* used
+restart_xt\.cc : dereferencing pointer .* does break strict-aliasing
 
 #
 # I think these are due to mix of C and C++.