1 files changed, 4 insertions, 1 deletions
diff --git a/storage/maria/ha_s3.cc b/storage/maria/ha_s3.cc
index 4b757cdcbfd..5d37a681e9b 100644
--- a/storage/maria/ha_s3.cc
+++ b/storage/maria/ha_s3.cc
@@ -678,7 +678,10 @@ static int ha_s3_init(void *p)
 {
   bool res;
   static const char *no_exts[]= { 0 };
-  DBUG_ASSERT(maria_hton);
+
+  /* This can happen if Aria fails to start */
+  if (!maria_hton)
+    return HA_ERR_INITIALIZATION;
 
   s3_hton= (handlerton *)p;