Bug#24437737: MYSQL 5.7.1{3,4} DOES NOT COMPILE OB GCC 6.1.1

Backport from trunk to 5.7 of:

Bug#23708395: GLIBC 2.24 DEPRECATES READDIR_R() BREAKING
              DEBUG BUILD OF MYSQL SERVER

As of glibc 2.24, readdir_r() has been deprecated. This breaks
our debug builds since the deprecation warning is upgraded to
an error during compilation.

This patch fixes the problem by removing use of readdir_r() and
using readdir() instead. This is thread safe as long as readdir()
is only used concurrently on different DIR* - which it is in
our case.

POSIX quote: "The pointer returned by readdir() points to data
which may be overwritten by another call to readdir() on the same
directory stream. This data is not overwritten by another call
to readdir() on a different directory stream."

Change-Id: I85a6f5da2d48c8d5a9804cd6281411d9e757f46c
(cherry picked from commit ba5245e9fef2257d60213076598268f544ca7109)

Author: jhauglid

cmake/os/WindowsCache.cmake

@@ -36,7 +36,6 @@ SET(CMAKE_HAVE_PTHREAD_H CACHE  INTERNAL "") # Only needed by CMake
 # Header files
 SET(HAVE_ALLOCA_H CACHE  INTERNAL "")
 SET(HAVE_ARPA_INET_H CACHE  INTERNAL "")
-SET(HAVE_DIRENT_H CACHE  INTERNAL "")
 SET(HAVE_DLFCN_H CACHE  INTERNAL "")
 SET(HAVE_EXECINFO_H CACHE  INTERNAL "")
 SET(HAVE_FPU_CONTROL_H CACHE  INTERNAL "")
@@ -118,7 +117,6 @@ SET(HAVE_POSIX_MEMALIGN CACHE  INTERNAL "")
 SET(HAVE_PREAD CACHE  INTERNAL "")
 SET(HAVE_PTHREAD_CONDATTR_SETCLOCK CACHE  INTERNAL "")
 SET(HAVE_PTHREAD_SIGMASK CACHE  INTERNAL "")
-SET(HAVE_READDIR_R CACHE  INTERNAL "")
 SET(HAVE_READLINK CACHE  INTERNAL "")
 SET(HAVE_REALPATH CACHE  INTERNAL "")
 SET(HAVE_SETFD CACHE  INTERNAL "")

config.h.cmake

@@ -34,7 +34,6 @@
 /* Header files */
 #cmakedefine HAVE_ALLOCA_H 1
 #cmakedefine HAVE_ARPA_INET_H 1
-#cmakedefine HAVE_DIRENT_H 1
 #cmakedefine HAVE_DLFCN_H 1
 #cmakedefine HAVE_EXECINFO_H 1
 #cmakedefine HAVE_FPU_CONTROL_H 1
@@ -116,7 +115,6 @@
 #cmakedefine HAVE_PREAD 1
 #cmakedefine HAVE_PTHREAD_CONDATTR_SETCLOCK 1
 #cmakedefine HAVE_PTHREAD_SIGMASK 1
-#cmakedefine HAVE_READDIR_R 1
 #cmakedefine HAVE_READLINK 1
 #cmakedefine HAVE_REALPATH 1
 #cmakedefine HAVE_SETFD 1

configure.cmake

@@ -395,7 +395,6 @@ INCLUDE (CheckIncludeFiles)
 
 CHECK_INCLUDE_FILES (alloca.h HAVE_ALLOCA_H)
 CHECK_INCLUDE_FILES (arpa/inet.h HAVE_ARPA_INET_H)
-CHECK_INCLUDE_FILES (dirent.h HAVE_DIRENT_H)
 CHECK_INCLUDE_FILES (dlfcn.h HAVE_DLFCN_H)
 CHECK_INCLUDE_FILES (execinfo.h HAVE_EXECINFO_H)
 CHECK_INCLUDE_FILES (fpu_control.h HAVE_FPU_CONTROL_H)
@@ -482,7 +481,6 @@ CHECK_FUNCTION_EXISTS (posix_memalign HAVE_POSIX_MEMALIGN)
 CHECK_FUNCTION_EXISTS (pread HAVE_PREAD) # Used by NDB
 CHECK_FUNCTION_EXISTS (pthread_condattr_setclock HAVE_PTHREAD_CONDATTR_SETCLOCK)
 CHECK_FUNCTION_EXISTS (pthread_sigmask HAVE_PTHREAD_SIGMASK)
-CHECK_FUNCTION_EXISTS (readdir_r HAVE_READDIR_R)
 CHECK_FUNCTION_EXISTS (readlink HAVE_READLINK)
 CHECK_FUNCTION_EXISTS (realpath HAVE_REALPATH)
 CHECK_FUNCTION_EXISTS (setfd HAVE_SETFD)

include/my_sys.h

@@ -681,7 +681,6 @@ extern size_t cleanup_dirname(char * to,const char *from);
 extern size_t system_filename(char * to,const char *from);
 extern size_t unpack_filename(char * to,const char *from);
 extern char * intern_filename(char * to,const char *from);
-extern char * directory_file_name(char * dst, const char *src);
 extern int pack_filename(char * to, const char *name, size_t max_length);
 extern char * my_path(char * to,const char *progname,
 			 const char *own_pathname_part);

mysys/my_lib.c

@@ -22,19 +22,10 @@
 #include "my_dir.h"	/* Structs used by my_dir,includes sys/types */
 #include "mysys_err.h"
 #include "my_thread_local.h"
-#if defined(HAVE_DIRENT_H)
+#if !defined(_WIN32)
 # include <dirent.h>
-# define NAMLEN(dirent) strlen((dirent)->d_name)
-#else
-# define dirent direct
-# define NAMLEN(dirent) (dirent)->d_namlen
 #endif
 
-#if defined(HAVE_READDIR_R)
-#define READDIR(A,B,C) ((errno=readdir_r(A,B,&C)) != 0 || !C)
-#else
-#define READDIR(A,B,C) (!(C=readdir(A)))
-#endif
 
 /*
   We are assuming that directory we are reading is either has less than 
@@ -75,6 +66,8 @@ static int comp_names(struct fileinfo *a, struct fileinfo *b)
 
 #if !defined(_WIN32)
 
+static char* directory_file_name(char *dst, const char *src);
+
 MY_DIR	*my_dir(const char *path, myf MyFlags)
 {
   char          *buffer;
@@ -83,29 +76,24 @@ MY_DIR	*my_dir(const char *path, myf MyFlags)
   DYNAMIC_ARRAY *dir_entries_storage;
   MEM_ROOT      *names_storage;
   DIR		*dirp;
-  struct dirent *dp;
   char		tmp_path[FN_REFLEN + 2], *tmp_file;
-  char	dirent_tmp[sizeof(struct dirent)+_POSIX_PATH_MAX+1];
+  const struct dirent *dp;
 
   DBUG_ENTER("my_dir");
   DBUG_PRINT("my",("path: '%s' MyFlags: %d",path,MyFlags));
 
-#if !defined(HAVE_READDIR_R)
-  mysql_mutex_lock(&THR_LOCK_open);
-#endif
-
   dirp = opendir(directory_file_name(tmp_path,(char *) path));
-  if (dirp == NULL || 
+  if (dirp == NULL ||
       ! (buffer= my_malloc(key_memory_MY_DIR,
                            ALIGN_SIZE(sizeof(MY_DIR)) + 
                            ALIGN_SIZE(sizeof(DYNAMIC_ARRAY)) +
                            sizeof(MEM_ROOT), MyFlags)))
     goto error;
 
-  dir_entries_storage= (DYNAMIC_ARRAY*)(buffer + ALIGN_SIZE(sizeof(MY_DIR))); 
+  dir_entries_storage= (DYNAMIC_ARRAY*)(buffer + ALIGN_SIZE(sizeof(MY_DIR)));
   names_storage= (MEM_ROOT*)(buffer + ALIGN_SIZE(sizeof(MY_DIR)) +
                              ALIGN_SIZE(sizeof(DYNAMIC_ARRAY)));
-  
+
   if (my_init_dynamic_array(dir_entries_storage,
                             key_memory_MY_DIR,
                             sizeof(FILEINFO),
@@ -116,25 +104,23 @@ MY_DIR	*my_dir(const char *path, myf MyFlags)
     goto error;
   }
   init_alloc_root(key_memory_MY_DIR, names_storage, NAMES_START_SIZE, NAMES_START_SIZE);
-  
+
   /* MY_DIR structure is allocated and completly initialized at this point */
   result= (MY_DIR*)buffer;
 
   tmp_file=strend(tmp_path);
 
-  dp= (struct dirent*) dirent_tmp;
-  
-  while (!(READDIR(dirp,(struct dirent*) dirent_tmp,dp)))
+  for (dp= readdir(dirp) ; dp; dp= readdir(dirp))
   {
     if (!(finfo.name= strdup_root(names_storage, dp->d_name)))
       goto error;
-    
+
     if (MyFlags & MY_WANT_STAT)
     {
-      if (!(finfo.mystat= (MY_STAT*)alloc_root(names_storage, 
+      if (!(finfo.mystat= (MY_STAT*)alloc_root(names_storage,
                                                sizeof(MY_STAT))))
         goto error;
-      
+
       memset(finfo.mystat, 0, sizeof(MY_STAT));
       (void) my_stpcpy(tmp_file,dp->d_name);
       (void) my_stat(tmp_path, finfo.mystat, MyFlags);
@@ -149,21 +135,16 @@ MY_DIR	*my_dir(const char *path, myf MyFlags)
   }
 
   (void) closedir(dirp);
-#if !defined(HAVE_READDIR_R)
-  mysql_mutex_unlock(&THR_LOCK_open);
-#endif
+
   result->dir_entry= (FILEINFO *)dir_entries_storage->buffer;
   result->number_off_files= dir_entries_storage->elements;
-  
+
   if (!(MyFlags & MY_DONT_SORT))
     my_qsort((void *) result->dir_entry, result->number_off_files,
           sizeof(FILEINFO), (qsort_cmp) comp_names);
   DBUG_RETURN(result);
 
  error:
-#if !defined(HAVE_READDIR_R)
-  mysql_mutex_unlock(&THR_LOCK_open);
-#endif
   set_my_errno(errno);
   if (dirp)
     (void) closedir(dirp);
@@ -185,7 +166,7 @@ MY_DIR	*my_dir(const char *path, myf MyFlags)
  * Returns pointer to dst;
  */
 
-char * directory_file_name (char * dst, const char *src)
+static char* directory_file_name(char *dst, const char *src)
 {
   /* Process as Unix format: just remove test the final slash. */
   char *end;