compilation fixes for sys-devel/gcc-11.2.0:11

MariaDB · Oct 25, 2021 · d22c8ca · d22c8ca
1 parent 481aa0a
commit d22c8ca
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 7 deletions.
diff --git a/sql/item_timefunc.cc b/sql/item_timefunc.cc
@@ -2832,7 +2832,6 @@ bool Item_func_timediff::get_date(MYSQL_TIME *ltime, ulonglong fuzzy_date)
   DBUG_ASSERT(fixed == 1);
   int l_sign= 1;
   MYSQL_TIME l_time1,l_time2,l_time3;
-  ErrConvTime str(&l_time3);
 
   /* the following may be true in, for example, date_add(timediff(...), ... */
   if (fuzzy_date & TIME_NO_ZERO_IN_DATE)

diff --git a/storage/innobase/include/univ.i b/storage/innobase/include/univ.i
@@ -240,6 +240,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)

diff --git a/storage/innobase/include/ut0byte.ic b/storage/innobase/include/ut0byte.ic
@@ -77,7 +77,7 @@ ut_uint64_align_up(
 /*********************************************************//**
 The following function rounds up a pointer to the nearest aligned address.
 @return aligned pointer */
-UNIV_INLINE
+UNIV_INLINE ATTRIBUTE_ACCESS((none,1))
 void*
 ut_align(
 /*=====*/
@@ -97,7 +97,7 @@ ut_align(
 The following function rounds down a pointer to the nearest
 aligned address.
 @return aligned pointer */
-UNIV_INLINE
+UNIV_INLINE ATTRIBUTE_ACCESS((none,1))
 void*
 ut_align_down(
 /*==========*/
@@ -117,7 +117,7 @@ ut_align_down(
 The following function computes the offset of a pointer from the nearest
 aligned address.
 @return distance from aligned pointer */
-UNIV_INLINE
+UNIV_INLINE ATTRIBUTE_ACCESS((none,1))
 ulint
 ut_align_offset(
 /*============*/

diff --git a/storage/innobase/pars/pars0grm.cc b/storage/innobase/pars/pars0grm.cc
@@ -79,6 +79,10 @@ que_node_t */
 #include "que0que.h"
 #include "row0sel.h"
 
+#ifdef __GNUC__
+#pragma GCC diagnostic ignored "-Wfree-nonheap-object"
+#endif
+
 #define YYSTYPE que_node_t*
 
 /* #define __STDC__ */

diff --git a/storage/innobase/pars/pars0grm.y b/storage/innobase/pars/pars0grm.y
@@ -38,6 +38,10 @@ que_node_t */
 #include "que0que.h"
 #include "row0sel.h"
 
+#ifdef __GNUC__
+#pragma GCC diagnostic ignored "-Wfree-nonheap-object"
+#endif
+
 #define YYSTYPE que_node_t*
 
 /* #define __STDC__ */

diff --git a/storage/maria/ma_loghandler.c b/storage/maria/ma_loghandler.c
@@ -3395,10 +3395,9 @@ static uint16 translog_get_chunk_header_length(uchar *chunk)
     DBUG_PRINT("info", ("TRANSLOG_CHUNK_LNGTH = 3"));
     DBUG_RETURN(3);
     break;
-  default:
-    DBUG_ASSERT(0);
-    DBUG_RETURN(0);                               /* Keep compiler happy */
   }
+  DBUG_ASSERT(0);
+  DBUG_RETURN(0);                               /* Keep compiler happy */
 }