Merge 10.4 into 10.5

1 files changed, 10 insertions, 0 deletions

diff --git a/sql/signal_handler.cc b/sql/signal_handler.cc
index f7959ea47f1..0a3a2ec6118 100644
--- a/sql/signal_handler.cc
+++ b/sql/signal_handler.cc
@@ -84,6 +84,12 @@ static inline void output_core_info()
     my_safe_printf_stderr("Core pattern: %.*s\n", (int) len, buff);
     my_close(fd, MYF(0));
   }
+  if ((fd= my_open("/proc/version", O_RDONLY, MYF(0))) >= 0)
+  {
+    len= my_read(fd, (uchar*)buff, sizeof(buff),  MYF(0));
+    my_safe_printf_stderr("Kernel version: %.*s\n", (int) len, buff);
+    my_close(fd, MYF(0));
+  }
 #endif
 #elif defined(__APPLE__) || defined(__FreeBSD__)
   char buff[PATH_MAX];
@@ -92,6 +98,10 @@ static inline void output_core_info()
   {
     my_safe_printf_stderr("Core pattern: %.*s\n", (int) len, buff);
   }
+  if (sysctlbyname("kern.version", buff, &len, NULL, 0) == 0)
+  {
+    my_safe_printf_stderr("Kernel version: %.*s\n", (int) len, buff);
+  }
 #else
   char buff[80];
   my_getwd(buff, sizeof(buff), 0);