diff options
| -rw-r--r-- | Docs/manual.texi | 2 | ||||
| -rw-r--r-- | include/errmsg.h | 5 | ||||
| -rw-r--r-- | include/m_string.h | 4 | ||||
| -rw-r--r-- | os2/MySQL-Sql.icc | 2 | ||||
| -rw-r--r-- | sql/mini_client.cc | 5 |
5 files changed, 13 insertions, 5 deletions
diff --git a/Docs/manual.texi b/Docs/manual.texi index fd785d323b4..c4618c2ada7 100644 --- a/Docs/manual.texi +++ b/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 diff --git a/include/errmsg.h b/include/errmsg.h index 7a967954bab..8087c526937 100644 --- a/include/errmsg.h +++ b/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 diff --git a/include/m_string.h b/include/m_string.h index 84c42e0c8b9..7eb2f1fe690 100644 --- a/include/m_string.h +++ b/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 diff --git a/os2/MySQL-Sql.icc b/os2/MySQL-Sql.icc index 0c3fc69d68c..addb645e2db 100644 --- a/os2/MySQL-Sql.icc +++ b/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 } diff --git a/sql/mini_client.cc b/sql/mini_client.cc index 3a2305aa69c..fe8a0a161b3 100644 --- a/sql/mini_client.cc +++ b/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 |