summaryrefslogtreecommitdiff
path: root/include/errmsg.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/errmsg.h')
-rw-r--r--include/errmsg.h5
1 files changed, 4 insertions, 1 deletions
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