Fix for OS2

Docs/manual.texi

@@ -34159,7 +34159,7 @@ if no @code{PRIMARY KEY} was specified explicitly.)
 @findex UNIQUE
 @findex PRIMARY KEY
 If you add a @code{UNIQUE INDEX} or @code{PRIMARY KEY} to a table, this
-is stored before any not @code[UNIQUE} index so that MySQL can detect
+is stored before any not @code{UNIQUE} index so that MySQL can detect
 duplicate keys as early as possible.
 
 @findex ORDER BY

include/errmsg.h

@@ -29,8 +29,11 @@ extern const char *client_errors[];	/* Error messages */
 
 #define CR_MIN_ERROR		2000	/* For easier client code */
 #define CR_MAX_ERROR		2999
-#undef ER
+#if defined(OS2) && defined( MYSQL_SERVER)
+#define CER(X) client_errors[(X)-CR_MIN_ERROR]
+#else
 #define ER(X) client_errors[(X)-CR_MIN_ERROR]
+#endif
 #define CLIENT_ERRMAP		2	/* Errormap used by my_error() */
 
 #define CR_UNKNOWN_ERROR	2000

include/m_string.h

@@ -82,7 +82,7 @@
 # define bmove_allign(A,B,C)    memcpy((A),(B),(C))
 #endif
 
-#ifdef	__cplusplus
+#if defined(__cplusplus) && !defined(OS2)
 extern "C" {
 #endif
 
@@ -238,7 +238,7 @@ extern ulonglong strtoull(const char *str, char **ptr, int base);
 #endif
 #endif
 
-#ifdef	__cplusplus
+#if defined(__cplusplus) && !defined(OS2)
 }
 #endif
 #endif

os2/MySQL-Sql.icc

@@ -81,7 +81,7 @@ option ProjectOptions = MySQLOptions
 
          // target source files
          source "rint.obj"
-         source zlib, ufc, regex
+         source zlib, ufc, regex, 'strings\bmove_upp.c'
          if debug_build  {
             source type('cpp') dbug
          }

sql/mini_client.cc

@@ -52,6 +52,11 @@ inline int local_thr_alarm(my_bool *A,int B __attribute__((unused)),ALARM *C __a
 #include "errmsg.h"
 #include <violite.h>
 
+#if defined( OS2) && defined( MYSQL_SERVER)
+#undef  ER
+#define ER CER
+#endif
+
 extern ulong net_read_timeout;
 
 extern "C" {					// Because of SCO 3.2V4.2