summaryrefslogtreecommitdiff
path: root/storage/innobase/include/univ.i
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2021-10-28 08:28:39 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2021-10-28 08:28:39 +0300
commit3a79e5fd317316c293baa459e8296fdb0744c280 (patch)
tree9ff2059bbd651715daa6a1d7241c0ddd303c0071 /storage/innobase/include/univ.i
parent7948a1dc53eccc23095a83daa5fd6b3bfaedf7f2 (diff)
parent657bcf928eb1c6a80ee2c82f0dcdd59ab02927e4 (diff)
downloadmariadb-git-3a79e5fd317316c293baa459e8296fdb0744c280.tar.gz
Merge 10.3 into 10.4
Diffstat (limited to 'storage/innobase/include/univ.i')
-rw-r--r--storage/innobase/include/univ.i6
1 files changed, 6 insertions, 0 deletions
diff --git a/storage/innobase/include/univ.i b/storage/innobase/include/univ.i
index ab9d4d296ad..f1e355ade4d 100644
--- a/storage/innobase/include/univ.i
+++ b/storage/innobase/include/univ.i
@@ -235,6 +235,12 @@ easy way to get it to work. See http://bugs.mysql.com/bug.php?id=52263. */
# define UNIV_INTERN
#endif
+#if defined(__GNUC__) && (__GNUC__ >= 11)
+# define ATTRIBUTE_ACCESS(X) __attribute__((access X))
+#else
+# define ATTRIBUTE_ACCESS(X)
+#endif
+
#ifndef MY_ATTRIBUTE
#if defined(__GNUC__)
# define MY_ATTRIBUTE(A) __attribute__(A)