summaryrefslogtreecommitdiff
path: root/storage/maria
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2022-03-29 19:41:38 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2022-03-29 19:41:38 +0300
commitd875c50bf4d70e50583b2830aeec91fe6f941142 (patch)
tree10cb9a1d14812140a326f13a73f8f5f1e7b1e0da /storage/maria
parent42609c240d7b0b5a418e7c77e74fa8274dda0bca (diff)
downloadmariadb-git-d875c50bf4d70e50583b2830aeec91fe6f941142.tar.gz
MDEV-17841 fixup: GCC -Wmaybe-uninitialized
Let us remove a redundant condition when the S3 plugin is disabled during compilation time.
Diffstat (limited to 'storage/maria')
-rw-r--r--storage/maria/ma_open.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/maria/ma_open.c b/storage/maria/ma_open.c
index cf5bf2a5fea..e3385a73f84 100644
--- a/storage/maria/ma_open.c
+++ b/storage/maria/ma_open.c
@@ -296,9 +296,9 @@ MARIA_HA *maria_open(const char *name, int mode, uint open_flags,
#ifndef WITH_S3_STORAGE_ENGINE
DBUG_ASSERT(!s3);
-#endif /* WITH_S3_STORAGE_ENGINE */
-
+#else
if (!s3)
+#endif /* WITH_S3_STORAGE_ENGINE */
{
realpath_err= my_realpath(name_buff, fn_format(org_name, name, "",
MARIA_NAME_IEXT,