diff --git a/storage/maria/ha_maria.cc b/storage/maria/ha_maria.cc
index 812fc69c2c2..c2f4d621305 100644
--- a/storage/maria/ha_maria.cc
+++ b/storage/maria/ha_maria.cc
@@ -1806,6 +1806,7 @@ int ha_maria::info(uint flag)
               MY_APPEND_EXT | MY_UNPACK_FILENAME);
     if (strcmp(name_buff, maria_info.index_file_name))
       index_file_name=maria_info.index_file_name;
+    data_file_type= maria_info.data_file_type;
   }
   if (flag & HA_STATUS_ERRKEY)
   {
diff --git a/storage/maria/ma_locking.c b/storage/maria/ma_locking.c
index 6865c653d7e..abb095d47c2 100644
--- a/storage/maria/ma_locking.c
+++ b/storage/maria/ma_locking.c
@@ -190,6 +190,7 @@ int maria_lock_database(MARIA_HA *info, int lock_type)
       share->tot_locks++;
       break;
     default:
+      DBUG_ASSERT(0);
       break;				/* Impossible */
     }
   }