diff options
| author | Monty <monty@mariadb.org> | 2019-10-20 12:16:52 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2019-10-20 12:16:52 +0300 |
| commit | 18a44b4b4b2fdf4aefc9ae2712678fc54ae42dfc (patch) | |
| tree | 061a28485fc0668fb62911fcc1bf485c42ac05f2 | |
| parent | 017150b74701827a5fa70a43f58552e732dfebff (diff) | |
| download | mariadb-git-18a44b4b4b2fdf4aefc9ae2712678fc54ae42dfc.tar.gz | |
Don't crash in S3 if Aria is not initialzedbb-10.5-sert
| -rw-r--r-- | storage/maria/ha_s3.cc | 5 |
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; |