Merge 10.3 into 10.4

4 files changed, 22 insertions, 15 deletions

diff --git a/mysys/array.c b/mysys/array.c
index 07abc460de7..e8b253a9e99 100644
--- a/mysys/array.c
+++ b/mysys/array.c
@@ -138,8 +138,9 @@ void *alloc_dynamic(DYNAMIC_ARRAY *array)
                                         array->size_of_element,
                                         MYF(array->malloc_flags | MY_WME))))
         DBUG_RETURN(0);
-      memcpy(new_ptr, array->buffer,
-             array->elements * array->size_of_element);
+      if (array->elements)
+        memcpy(new_ptr, array->buffer,
+               array->elements * array->size_of_element);
       array->malloc_flags&= ~MY_INIT_BUFFER_USED;
     }
     else if (!(new_ptr=(char*)
diff --git a/mysys/my_addr_resolve.c b/mysys/my_addr_resolve.c
index 3f20f535d37..3a49c749010 100644
--- a/mysys/my_addr_resolve.c
+++ b/mysys/my_addr_resolve.c
@@ -159,10 +159,18 @@ err:
 #include <ctype.h>
 #include <sys/wait.h>
 
+#if defined(HAVE_POLL_H)
+#include <poll.h>
+#elif defined(HAVE_SYS_POLL_H)
+#include <sys/poll.h>
+#endif /* defined(HAVE_POLL_H) */
+
 static int in[2], out[2];
 static pid_t pid;
 static char addr2line_binary[1024];
 static char output[1024];
+static struct pollfd poll_fds;
+Dl_info info;
 
 int start_addr2line_fork(const char *binary_path)
 {
@@ -212,15 +220,16 @@ int my_addr_resolve(void *ptr, my_addr_loc *loc)
   ssize_t extra_bytes_read = 0;
   ssize_t parsed = 0;
 
-  fd_set set;
-  struct timeval timeout;
+  int ret;
 
   int filename_start = -1;
   int line_number_start = -1;
 
-  Dl_info info;
   void *offset;
 
+  poll_fds.fd = out[0];
+  poll_fds.events = POLLIN | POLLRDBAND;
+
   if (!dladdr(ptr, &info))
     return 1;
 
@@ -242,16 +251,16 @@ int my_addr_resolve(void *ptr, my_addr_loc *loc)
   if (write(in[1], input, len) <= 0)
     return 3;
 
-  FD_ZERO(&set);
-  FD_SET(out[0], &set);
 
-  /* 100 ms should be plenty of time for addr2line to issue a response. */
-  timeout.tv_sec = 0;
-  timeout.tv_usec = 100000;
+  /* 500 ms should be plenty of time for addr2line to issue a response. */
   /* Read in a loop till all the output from addr2line is complete. */
   while (parsed == total_bytes_read &&
-         select(out[0] + 1, &set, NULL, NULL, &timeout) > 0)
+         (ret= poll(&poll_fds, 1, 500)))
   {
+    /* error during poll */
+    if (ret < 0)
+      return 1;
+
     extra_bytes_read= read(out[0], output + total_bytes_read,
                            sizeof(output) - total_bytes_read);
     if (extra_bytes_read < 0)
diff --git a/mysys/my_alloc.c b/mysys/my_alloc.c
index 536a3a5f3bc..a6f38dcb145 100644
--- a/mysys/my_alloc.c
+++ b/mysys/my_alloc.c
@@ -491,7 +491,7 @@ char *strmake_root(MEM_ROOT *root, const char *str, size_t len)
 void *memdup_root(MEM_ROOT *root, const void *str, size_t len)
 {
   char *pos;
-  if ((pos=alloc_root(root,len)))
+  if ((pos=alloc_root(root,len)) && len)
     memcpy(pos,str,len);
   return pos;
 }
diff --git a/mysys/my_error.c b/mysys/my_error.c
index 20836269939..2bb9305b2fb 100644
--- a/mysys/my_error.c
+++ b/mysys/my_error.c
@@ -112,9 +112,6 @@ void my_error(uint nr, myf MyFlags, ...)
   char ebuff[ERRMSGSIZE];
   DBUG_ENTER("my_error");
   DBUG_PRINT("my", ("nr: %d  MyFlags: %lu  errno: %d", nr, MyFlags, errno));
-
-  if (errno == 1213)
-    DBUG_ASSERT(0);
   
   if (!(format = my_get_err_msg(nr)))
     (void) my_snprintf(ebuff, sizeof(ebuff), "Unknown error %d", nr);