summaryrefslogtreecommitdiff
path: root/include/errmsg.h
diff options
context:
space:
mode:
authormonty@mashka.mysql.fi <>2003-01-23 21:49:28 +0200
committermonty@mashka.mysql.fi <>2003-01-23 21:49:28 +0200
commit9af5e6b70a4e4a3bd84bb57ccddf7dd418241505 (patch)
tree375d93b375cef0b45b2ea1747ebad44e8f99b534 /include/errmsg.h
parent7d4fd4745513c12940aeadf4e9a5aa39cb95d666 (diff)
downloadmariadb-git-9af5e6b70a4e4a3bd84bb57ccddf7dd418241505.tar.gz
Avoid memory overruns when buffer_length is too small (when fetching binary data in prepared statements)
Diffstat (limited to 'include/errmsg.h')
-rw-r--r--include/errmsg.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/errmsg.h b/include/errmsg.h
index 5f462565e33..1f4e6e12f00 100644
--- a/include/errmsg.h
+++ b/include/errmsg.h
@@ -30,7 +30,7 @@ extern const char *client_errors[]; /* Error messages */
#define CR_MAX_ERROR 2999
#if defined(OS2) && defined(MYSQL_SERVER)
#define CER(X) client_errors[(X)-CR_MIN_ERROR]
-#else
+#elif !defined(ER)
#define ER(X) client_errors[(X)-CR_MIN_ERROR]
#endif
#define CLIENT_ERRMAP 2 /* Errormap used by my_error() */