Merge commit 'mysql-8.0' into mysql-trunk

Change-Id: I927b8dee0213d819884e946e709da2dde5eb2e04

Author: zmur

storage/ndb/include/portlib/ndb_file.h

@@ -236,6 +236,7 @@ class ndb_file
   int detect_direct_io_block_size_and_alignment();
   bool check_block_size_and_alignment(const void* buf, size_t count,
                                       ndb_off_t offset) const;
+  bool check_is_regular_file() const;
   bool is_regular_file() const;
   int do_sync_after_write(size_t written_bytes);
 

storage/ndb/include/portlib/ndb_socket_posix.h

@@ -35,6 +35,7 @@
 #include <sys/stat.h>
 
 #include "ndb_config.h"
+#include "util/require.h"
 
 #ifdef HAVE_POLL_H
 #include <poll.h>
@@ -109,21 +110,39 @@ int ndb_socket_nonblock(ndb_socket_t s, int enable)
   return 0;
 }
 
+static inline
+bool ndb_is_socket(ndb_socket_t s)
+{
+#if defined(VM_TRACE) || !defined(NDEBUG) || defined(ERROR_INSERT)
+  if (s.s == INVALID_SOCKET) return true;
+  struct stat sb;
+  if (fstat(s.s, &sb) == -1) return true;
+  if((sb.st_mode & S_IFMT) == S_IFSOCK) return true;
+  fprintf(stderr,"FATAL ERROR: %s: %u: Handle is not a socket: fd=%d file type=%o\n",__func__,__LINE__,s.s,sb.st_mode&S_IFMT);
+  return false;
+#else
+  return true;
+#endif
+}
+
 static inline
 ssize_t ndb_recv(ndb_socket_t s, char* buf, size_t len, int flags)
 {
+  require(ndb_is_socket(s));
   return recv(s.s, buf, len, flags);
 }
 
 static inline
 ssize_t ndb_send(ndb_socket_t s, const char* buf, size_t len, int flags)
 {
+  require(ndb_is_socket(s));
   return send(s.s, buf, len, flags);
 }
 
 static inline
 ssize_t ndb_socket_writev(ndb_socket_t s, const struct iovec *iov, int iovcnt)
 {
+  require(ndb_is_socket(s));
   return writev(s.s, iov, iovcnt);
 }
 

storage/ndb/src/common/portlib/ndb_file_posix.cpp

@@ -65,8 +65,23 @@ bool ndb_file::is_regular_file() const
   return false;
 }
 
+bool ndb_file::check_is_regular_file() const
+{
+#if defined(VM_TRACE) || !defined(NDEBUG) || defined(ERROR_INSERT)
+  if (!is_open()) return true;
+  struct stat sb;
+  if (fstat(m_handle, &sb) == -1) return true;
+  if ((sb.st_mode & S_IFMT) == S_IFREG) return true;
+  fprintf(stderr,"FATAL ERROR: %s: %u: Handle is not a regular file: fd=%d file type=%o\n",__func__,__LINE__,m_handle,sb.st_mode&S_IFMT);
+  return false;
+#else
+  return true;
+#endif
+}
+
 int ndb_file::write_forward(const void* buf, ndb_file::size_t count)
 {
+  require(check_is_regular_file());
   require(check_block_size_and_alignment(buf, count, get_pos()));
   int ret;
   do {
@@ -83,6 +98,7 @@ int ndb_file::write_forward(const void* buf, ndb_file::size_t count)
 int ndb_file::write_pos(const void* buf, ndb_file::size_t count,
                         ndb_off_t offset)
 {
+  require(check_is_regular_file());
   require(check_block_size_and_alignment(buf, count, offset));
   int ret;
   do {
@@ -98,6 +114,7 @@ int ndb_file::write_pos(const void* buf, ndb_file::size_t count,
 
 int ndb_file::read_forward(void* buf, ndb_file::size_t count) const
 {
+  require(check_is_regular_file());
   require(check_block_size_and_alignment(buf, count, 1));
   int ret;
   do {
@@ -107,6 +124,7 @@ int ndb_file::read_forward(void* buf, ndb_file::size_t count) const
 }
 int ndb_file::read_backward(void* buf, ndb_file::size_t count) const
 {
+  require(check_is_regular_file());
   require(check_block_size_and_alignment(buf, count, 1));
   // Current pos must be within file.
   // Current pos - count must be within file.
@@ -146,6 +164,7 @@ int ndb_file::read_backward(void* buf, ndb_file::size_t count) const
 int ndb_file::read_pos(void* buf, ndb_file::size_t count,
     ndb_off_t offset) const
 {
+  require(check_is_regular_file());
   require(check_block_size_and_alignment(buf, count, offset));
   int ret;
   do {