diff options
| author | unknown <bar@mysql.com> | 2005-02-23 16:29:01 +0400 |
|---|---|---|
| committer | unknown <bar@mysql.com> | 2005-02-23 16:29:01 +0400 |
| commit | 2e199a1e8d8a458f08861b4bf00ceb21210351fe (patch) | |
| tree | 3e5f0fb6db4b1de3402353692a9cb63ca6b96d5a /include/mysys_err.h | |
| parent | e1d76d166304c96b8f35fc782aafd374a42bc8c5 (diff) | |
| parent | 990d937de254cc1c92cb45e3866fff414d2bdd7e (diff) | |
| download | mariadb-git-2e199a1e8d8a458f08861b4bf00ceb21210351fe.tar.gz | |
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/bar/mysql-4.1
Diffstat (limited to 'include/mysys_err.h')
| -rw-r--r-- | include/mysys_err.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/mysys_err.h b/include/mysys_err.h index 230be5f4720..19106dc3553 100644 --- a/include/mysys_err.h +++ b/include/mysys_err.h @@ -21,7 +21,7 @@ extern "C" { #endif #define GLOB 0 /* Error maps */ -#define GLOBERRS 28 /* Max number of error messages in map's */ +#define GLOBERRS 29 /* Max number of error messages in map's */ #define EE(X) globerrs[ X ] /* Defines to add error to right map */ extern const char * NEAR globerrs[]; /* my_error_messages is here */ @@ -54,6 +54,7 @@ extern const char * NEAR globerrs[]; /* my_error_messages is here */ #define EE_CANT_SYMLINK 25 #define EE_REALPATH 26 #define EE_SYNC 27 +#define EE_UNKNOWN_COLLATION 28 /* exit codes for all MySQL programs */ |