summaryrefslogtreecommitdiff
path: root/storage/maria
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2022-03-14 10:59:46 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2022-03-14 10:59:46 +0200
commit572e34304ef375651ca9d621d77f7eb61c66b8e0 (patch)
tree1eb9035945a8061668f2d5bcc819f9f415ad15a0 /storage/maria
parent3b4996793617ff8244d5636c3268d69c9d72deb2 (diff)
parent258c34f17cd5a06e29888498064bb46d019dc58f (diff)
downloadmariadb-git-572e34304ef375651ca9d621d77f7eb61c66b8e0.tar.gz
Merge 10.5 into 10.6
Diffstat (limited to 'storage/maria')
-rw-r--r--storage/maria/s3_func.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/storage/maria/s3_func.h b/storage/maria/s3_func.h
index a062131d5a5..f73a95dea24 100644
--- a/storage/maria/s3_func.h
+++ b/storage/maria/s3_func.h
@@ -141,7 +141,6 @@ C_MODE_END
C_MODE_START
/* Dummy structures and interfaces to be used when compiling without S3 */
struct s3_info;
-typedef struct s3_info S3_INFO;
struct ms3_st;
C_MODE_END
#endif /* WITH_S3_STORAGE_ENGINE */