bug#20095208 - UNABLE TO STORE FRAGMENT DURING LCP. NDBFS ERROR: 2812 - DBLQH (LINE: 14305)

Including EventLogger.hpp via ndb_socket.h caused unrelated link problem on Solaris (missing symbols in Parser-t). Move implementation of my_socket_close to ndb_socket.cpp.

Author: Pekka Nousiainen

storage/ndb/include/portlib/ndb_socket_posix.h

@@ -23,10 +23,6 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
-#include <sys/stat.h>
-#include <EventLogger.hpp>
-
-extern EventLogger* g_eventLogger;
 
 #define MY_SOCKET_FORMAT "%d"
 #define MY_SOCKET_FORMAT_VALUE(x) (x.fd)
@@ -63,20 +59,8 @@ static inline int my_socket_get_fd(ndb_socket_t s)
  return s.fd;
 }
 
-static inline int my_socket_close(ndb_socket_t s)
-{
- struct stat sb;
- if (fstat(s.fd, &sb) == 0)
- {
- if ((sb.st_mode & S_IFMT) != S_IFSOCK)
- {
- g_eventLogger->error("fd=%d: not socket: mode=%o",
- s.fd, sb.st_mode);
- abort();
- }
- }
- return close(s.fd);
-}
+/* implemented in ndb_socket.cpp */
+extern int my_socket_close(ndb_socket_t s);
 
 static inline int my_socket_errno()
 {

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

@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
 
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
@@ -19,6 +19,38 @@
 #include "m_string.h"
 #include "ndb_socket.h"
 
+/*
+ Implement my_socket_close here to avoid EventLogger.hpp in
+ header file (causes unrelated link problem on Solaris).
+*/
+
+#if defined _WIN32
+
+/* skip */
+
+#else
+
+#include <sys/stat.h>
+#include <EventLogger.hpp>
+
+extern EventLogger* g_eventLogger;
+
+int my_socket_close(ndb_socket_t s)
+{
+ struct stat sb;
+ if (fstat(s.fd, &sb) == 0)
+ {
+ if ((sb.st_mode & S_IFMT) != S_IFSOCK)
+ {
+ g_eventLogger->error("fd=%d: not socket: mode=%o",
+ s.fd, sb.st_mode);
+ abort();
+ }
+ }
+ return close(s.fd);
+}
+
+#endif
 
 /*
  Implement my_socketpair() so that it works both on UNIX and windows