Another long patch to remove the rest of the OS2 support.

include/config-win.h:
  Removing OS2 stuff
include/errmsg.h:
  Removing OS2 stuff
include/m_string.h:
  OS2 removal
include/my_global.h:
  OS2 removal
include/my_net.h:
  OS2 removal
include/my_no_pthread.h:
  OS2 removal
include/my_pthread.h:
  OS2 removal
include/thr_alarm.h:
  OS2 removal
mysys/default.c:
  OS2 removal
mysys/mf_path.c:
  OS2 removal
mysys/mf_tempdir.c:
  OS2 removal
mysys/mf_tempfile.c:
  OS2 removal
mysys/my_access.c:
  OS2 removal
mysys/my_clock.c:
  OS2 removal
mysys/my_copy.c:
  OS2 removal
mysys/my_create.c:
  OS2 removal
mysys/my_dup.c:
  OS2 removal
mysys/my_file.c:
  OS2 removal
mysys/my_getwd.c:
  OS2 removal
mysys/my_init.c:
  OS2 removal
mysys/my_lib.c:
  OS2 removal
mysys/my_lock.c:
  OS2 removal
mysys/my_mkdir.c:
  OS2 removal
mysys/my_open.c:
  OS2 removal
mysys/my_pthread.c:
  OS2 removal
mysys/my_redel.c:
  OS2 removal
mysys/my_sleep.c:
  OS2 removal
mysys/my_static.c:
  OS2 removal
mysys/my_thr_init.c:
  OS2 removal
mysys/thr_alarm.c:
  OS2 removal
storage/myisam/myisamchk.c:
  OS2 removal

1 files changed, 2 insertions, 15 deletions

diff --git a/mysys/my_getwd.c b/mysys/my_getwd.c
index 5663ceaa60e..765c30bc281 100644
--- a/mysys/my_getwd.c
+++ b/mysys/my_getwd.c
@@ -27,14 +27,6 @@
 #include <dos.h>
 #include <direct.h>
 #endif
-#if defined(OS2)
-#include <direct.h>
-#endif
-
-#ifdef __EMX__
-/* chdir2 support also drive change */
-#define chdir _chdir2
-#endif
 
 	/* Gets current working directory in buff. Directory is allways ended
 	   with FN_LIBCHAR */
@@ -95,14 +87,14 @@ int my_setwd(const char *dir, myf MyFlags)
   int res;
   size_s length;
   my_string start,pos;
-#if defined(VMS) || defined(MSDOS) || defined(OS2)
+#if defined(VMS) || defined(MSDOS)
   char buff[FN_REFLEN];
 #endif
   DBUG_ENTER("my_setwd");
   DBUG_PRINT("my",("dir: '%s'  MyFlags %d", dir, MyFlags));
 
   start=(my_string) dir;
-#if defined(MSDOS) || defined(OS2) /* OS2/MSDOS chdir can't change drive */
+#if defined(MSDOS) /* MSDOS chdir can't change drive */
 #if !defined(_DDL) && !defined(WIN32)
   if ((pos=(char*) strchr(dir,FN_DEVCHAR)) != 0)
   {
@@ -113,13 +105,8 @@ int my_setwd(const char *dir, myf MyFlags)
     drives= (uint) -1;
     if ((pos-(byte*) dir) == 2 && drive > 0 && drive < 32)
     {
-#ifdef OS2
-      _chdrive(drive);
-      drives = _getdrive();
-#else
       _dos_setdrive(drive,&drives);
       _dos_getdrive(&drives);
-#endif
     }
     if (drive != drives)
     {