Merge pull request percona#4296 from inikep/PS-7694-5.7

PS-7694 [5.7]: Fix compilation issues with gcc-11
inikep · May 12, 2021 · ade7df4 · ade7df4
2 parents 4a26f53 + 6b309f4
commit ade7df4
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 7 deletions.
diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt
@@ -186,6 +186,14 @@ IF(HAVE_MISLEADING_INDENTATION)
     COMPILE_FLAGS "-Wno-misleading-indentation")
 ENDIF()
 
+# Suppress warnings for gcc-11 or newer
+IF(CMAKE_COMPILER_IS_GNUCXX AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 11)
+  ADD_CXX_COMPILE_FLAGS_TO_FILES(-Wno-array-bounds FILES ../sql/spatial.cc)
+  ADD_CXX_COMPILE_FLAGS_TO_FILES(-Wno-stringop-overflow FILES ../sql/spatial.cc)
+  # a false positive with a bison-generated file (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=98753)
+  ADD_CXX_COMPILE_FLAGS_TO_FILES(-Wno-free-nonheap-object FILES ${CMAKE_CURRENT_BINARY_DIR}/sql_hints.yy.cc)
+ENDIF()
+
 # Handle out-of-source build from source package with possibly broken 
 # bison. Copy bison output to from source to build directory, if not already 
 # there

diff --git a/mysys/thr_lock.c b/mysys/thr_lock.c
@@ -1389,6 +1389,7 @@ static void *test_thread(void *arg)
   THR_LOCK_DATA *multi_locks[MAX_LOCK_COUNT];
   my_thread_id id;
   mysql_cond_t COND_thr_lock;
+  memset(&COND_thr_lock, 0, sizeof(COND_thr_lock));
 
   id= param + 1; /* Main thread uses value 0. */
   mysql_cond_init(0, &COND_thr_lock);

diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt
@@ -407,6 +407,14 @@ IF (WIN32 AND OPENSSL_APPLINK_C)
   )
 ENDIF()
 
+# Suppress warnings for gcc-11 or newer
+IF(CMAKE_COMPILER_IS_GNUCXX AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 11)
+  ADD_CXX_COMPILE_FLAGS_TO_FILES(-Wno-array-bounds FILES spatial.cc)
+  ADD_CXX_COMPILE_FLAGS_TO_FILES(-Wno-stringop-overflow FILES spatial.cc)
+  # a false positive with a bison-generated file (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=98753)
+  ADD_CXX_COMPILE_FLAGS_TO_FILES(-Wno-free-nonheap-object FILES ${CMAKE_CURRENT_BINARY_DIR}/sql_hints.yy.cc)
+ENDIF()
+
 ADD_CONVENIENCE_LIBRARY(sql ${SQL_SOURCE})
 ADD_DEPENDENCIES(sql GenServerSource)
 ADD_DEPENDENCIES(sql GenDigestServerSource)

diff --git a/sql/item_geofunc_internal.cc b/sql/item_geofunc_internal.cc
@@ -124,8 +124,7 @@ merge_components(my_bool *pnull_value)
   if (is_comp_no_overlapped())
     return;
 
-  POS pos;
-  Item_func_spatial_operation ifso(pos, NULL, NULL,
+  Item_func_spatial_operation ifso(POS(), NULL, NULL,
                                    Item_func_spatial_operation::op_union);
   bool do_again= true;
   uint32 last_composition[6]= {0}, num_unchanged_composition= 0;

diff --git a/sql/opt_range.cc b/sql/opt_range.cc
@@ -14904,7 +14904,7 @@ static void append_range_all_keyparts(Opt_trace_array *range_trace,
       range_string and the string becomes too long. Printing very long
       range conditions normally doesn't make sense either.
      */
-    if (!append_to_trace && range_string->length() > 500)
+    if (!append_to_trace && range_string && range_string->length() > 500)
     {
       range_string->append(STRING_WITH_LEN("..."));
       break;
@@ -14942,7 +14942,7 @@ static void append_range_all_keyparts(Opt_trace_array *range_trace,
       if (append_to_trace)
         range_trace->add_utf8(range_so_far->ptr(),
                               range_so_far->length());
-      else
+      else if (range_string)
       {
         if (range_string->length() == 0)
           range_string->append(STRING_WITH_LEN("("));

diff --git a/storage/innobase/CMakeLists.txt b/storage/innobase/CMakeLists.txt
@@ -196,6 +196,12 @@ IF(HAVE_CAST_FUNCTION_TYPE)
     COMPILE_FLAGS "-Wno-cast-function-type")
 ENDIF()
 
+# Suppress warnings for gcc-11 or newer
+IF(CMAKE_COMPILER_IS_GNUCXX AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 11)
+  # a false positive with a bison-generated file (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=98753)
+  ADD_CXX_COMPILE_FLAGS_TO_FILES(-Wno-free-nonheap-object FILES pars/pars0grm.cc)
+ENDIF()
+
 # A GCC bug causes crash when compiling these files on ARM64 with -O1+
 # Compile them with -O0 as a workaround.
 IF(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64")

diff --git a/storage/innobase/include/mem0mem.ic b/storage/innobase/include/mem0mem.ic
@@ -597,6 +597,8 @@ mem_strdupl(
 	ulint		len)	/*!< in: length of str, in bytes */
 {
 	char*	s = static_cast<char*>(ut_malloc_nokey(len + 1));
+	if (!s) return NULL;
+
 	s[len] = 0;
 	if (len > 0) {
 		memcpy(s, str, len);

diff --git a/testclients/mysql_client_test.c b/testclients/mysql_client_test.c
@@ -18146,9 +18146,9 @@ static void test_bug40365(void)
     if (!opt_silent)
       fprintf(stdout, "\ntime[%d]: %02d-%02d-%02d ",
               i, tm[i].year, tm[i].month, tm[i].day);
-      DIE_UNLESS(tm[i].year == 0);
-      DIE_UNLESS(tm[i].month == 0);
-      DIE_UNLESS(tm[i].day == 0);
+    DIE_UNLESS(tm[i].year == 0);
+    DIE_UNLESS(tm[i].month == 0);
+    DIE_UNLESS(tm[i].day == 0);
   }
   mysql_stmt_close(stmt);
   rc= mysql_commit(mysql);

diff --git a/unittest/gunit/strings_utf8-t.cc b/unittest/gunit/strings_utf8-t.cc
@@ -189,6 +189,7 @@ TEST_F(StringsUTF8Test, MyIsmbcharUtf8)
 
   /* valid utf8 charaters, testing for boundry values */
   utf8_src[0]= '\x00';
+  utf8_src[1]= '\x00';
   EXPECT_EQ(0U, system_charset_info->cset->ismbchar(system_charset_info,
                                                     utf8_src, utf8_src + 1));
 
@@ -366,6 +367,7 @@ TEST_F(StringsUTF8mb4Test, MyIsmbcharUtf8mb4)
 
   /* valid utf8mb4 charaters, testing for boundry values */
   utf8_src[0]= '\x00';
+  utf8_src[1]= '\x00';
   EXPECT_EQ(0U, system_charset_info->cset->ismbchar(system_charset_info,
                                                     utf8_src,utf8_src + 1));
   utf8_src[0]= '\x7f';