diff --git a/storage/maria/ma_loghandler.c b/storage/maria/ma_loghandler.c
index 16cd0a09af5f2..9e6df2eb9a0b7 100644
--- a/storage/maria/ma_loghandler.c
+++ b/storage/maria/ma_loghandler.c
@@ -7775,7 +7775,7 @@ void translog_flush_buffers(TRANSLOG_ADDRESS *lsn,
 {
   dirty_buffer_mask_t dirty_buffer_mask;
   uint i;
-  uint8 UNINIT_VAR(last_buffer_no), start_buffer_no;
+  uint8 last_buffer_no, start_buffer_no;
   DBUG_ENTER("translog_flush_buffers");
 
   /*
@@ -7840,6 +7840,10 @@ void translog_flush_buffers(TRANSLOG_ADDRESS *lsn,
                      TRANSLOG_BUFFERS_NO);
     translog_unlock();
   }
+  else
+  {
+    last_buffer_no= 0;
+  }
   /* flush buffers */
   *sent_to_disk= translog_get_sent_to_disk();
   if (cmp_translog_addr(*lsn, *sent_to_disk) > 0)