Final patch to remove the last of the OS2 support.

client/client_priv.h:
  OS2 removal
client/mysql.cc:
  OS2 removal
dbug/dbug.c:
  OS2 removal
include/m_string.h:
  OS2 removal
include/my_global.h:
  Cleanup for have_mit
libmysql/dll.c:
  OS2 removal
libmysql/get_password.c:
  OS2 removal
libmysql/libmysql.c:
  OS2 removal
libmysql/manager.c:
  OS2 removal
sql-common/client.c:
  OS2 removal
sql/event_executor.cc:
  OS2 removal
sql/hostname.cc:
  OS2 removal
sql/log.cc:
  OS2 removal
sql/log_event.h:
  OS2 removal
sql/my_lock.c:
  OS2 removal
sql/mysql_priv.h:
  OS2 removal
sql/mysqld.cc:
  OS2 removal
sql/net_serv.cc:
  OS2 removal
sql/repl_failsafe.cc:
  OS2 removal
sql/slave.cc:
  OS2 removal
sql/sql_base.cc:
  OS2 removal
sql/sql_insert.cc:
  OS2 removal
sql/sql_load.cc:
  OS2 removal
sql/sql_parse.cc:
  OS2 removal
sql/sql_table.cc:
  OS2 removal
storage/myisam/myisamchk.c:
  OS2 removal
storage/ndb/src/mgmclient/main.cpp:
  OS2 removal
storage/ndb/src/mgmsrv/main.cpp:
  OS2 removal
vio/vio.c:
  OS2 removal
vio/viosocket.c:
  OS2 removal
vio/viossl.c:
  OS2 removal

4 files changed, 4 insertions, 29 deletions

diff --git a/libmysql/dll.c b/libmysql/dll.c
index b0e4b9cab3b..f5db0bb4669 100644
--- a/libmysql/dll.c
+++ b/libmysql/dll.c
@@ -112,26 +112,3 @@ int _export FAR PASCAL libmain(HANDLE hModule,short cbHeapSize,
 }
 
 #endif
-
-#ifdef OS2
-
-/*
-  This function is called automatically by _DLL_InitTerm
-  Every dll runtime enviroment is not tz enabled, so tzset()
-  must be called to enable TZ handling
-  Also timezone is fixed.
-*/
-
-extern "C" unsigned long _System DllMain(unsigned long modhandle,
-                                        unsigned long flag)
-{
-   if (flag == 0) {
-      tzset();			/* Set tzname */
-      time_t currentTime = time(NULL);
-      struct tm *ts = localtime(&currentTime);
-      if (ts->tm_isdst > 0)
-         _timezone -= 3600;
-   }
-}
-
-#endif
diff --git a/libmysql/get_password.c b/libmysql/get_password.c
index e55e77320f0..a48cb6d7a6e 100644
--- a/libmysql/get_password.c
+++ b/libmysql/get_password.c
@@ -36,7 +36,7 @@
 #include <pwd.h>
 #endif /* HAVE_PWD_H */
 #else /* ! HAVE_GETPASS */
-#if !defined(__WIN__) && !defined(OS2) && !defined(__NETWARE__)
+#if !defined(__WIN__) && !defined(__NETWARE__)
 #include <sys/ioctl.h>
 #ifdef HAVE_TERMIOS_H				/* For tty-password */
 #include	<termios.h>
@@ -65,7 +65,7 @@
 #define getpass(A) getpassphrase(A)
 #endif
 
-#if defined( __WIN__) || defined(OS2) || defined(__NETWARE__)
+#if defined( __WIN__) || defined(__NETWARE__)
 /* were just going to fake it here and get input from the keyboard */
 
 #ifdef __NETWARE__
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c
index 3406d606692..b750e9cc4b2 100644
--- a/libmysql/libmysql.c
+++ b/libmysql/libmysql.c
@@ -739,7 +739,7 @@ void read_user_name(char *name)
   strmake(name, str ? str : "UNKNOWN_USER", USERNAME_LENGTH);
 }
 
-#elif !defined(MSDOS) && ! defined(VMS) && !defined(__WIN__) && !defined(OS2)
+#elif !defined(MSDOS) && ! defined(VMS) && !defined(__WIN__)
 
 void read_user_name(char *name)
 {
diff --git a/libmysql/manager.c b/libmysql/manager.c
index 631bfa26cb2..a88c63123b0 100644
--- a/libmysql/manager.c
+++ b/libmysql/manager.c
@@ -35,9 +35,7 @@
 #include <signal.h>
 #include <errno.h>
 
-#if defined(OS2)
-#  include <sys/un.h>
-#elif defined(__NETWARE__)
+#if defined(__NETWARE__)
 #include <netdb.h>
 #include <sys/select.h>
 #include <sys/utsname.h>