diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-01-23 21:49:28 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-01-23 21:49:28 +0200 |
| commit | 36b25ee59a4779e5f34c922bdf78360c58d4c108 (patch) | |
| tree | 375d93b375cef0b45b2ea1747ebad44e8f99b534 /include/errmsg.h | |
| parent | 897c374bca3277448de09177351cda6fee56676e (diff) | |
| download | mariadb-git-36b25ee59a4779e5f34c922bdf78360c58d4c108.tar.gz | |
Avoid memory overruns when buffer_length is too small (when fetching binary data in prepared statements)
include/errmsg.h:
Remove compiler warning
libmysql/libmysql.c:
Avoid memory overruns when buffer_length is too small
libmysqld/lib_sql.cc:
Fixed function name
sql/mysqld.cc:
Code cleanup; Added back shared memory support (which was accidently deleted)
sql/sql_parse.cc:
Clean up multi-query
Diffstat (limited to 'include/errmsg.h')
| -rw-r--r-- | include/errmsg.h | 2 |
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() */ |