diff options
| author | unknown <bar@mysql.com> | 2005-02-23 17:03:34 +0400 |
|---|---|---|
| committer | unknown <bar@mysql.com> | 2005-02-23 17:03:34 +0400 |
| commit | 3fe941e4d3a8424f68563143c7b05b8d7bcac225 (patch) | |
| tree | 4816d63590de39ffa898bdb571300ca8a5b73c9c /include/mysys_err.h | |
| parent | e6944e4d32040d41474a7badc132ae0e7f50c7d2 (diff) | |
| parent | 2e199a1e8d8a458f08861b4bf00ceb21210351fe (diff) | |
| download | mariadb-git-3fe941e4d3a8424f68563143c7b05b8d7bcac225.tar.gz | |
Merge
include/config-win.h:
Auto merged
myisam/myisamchk.c:
Auto merged
mysys/errors.c:
Auto merged
include/mysys_err.h:
Merge from 4.1, attempt#2.
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 1fd7c2eddc6..1e489395c76 100644 --- a/include/mysys_err.h +++ b/include/mysys_err.h @@ -56,7 +56,8 @@ 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_ERROR_LAST 27 /*Copy last error nr.*/ +#define EE_UNKNOWN_COLLATION 28 +#define EE_ERROR_LAST 28 /*Copy last error nr.*/ /* Add error numbers before EE_ERROR_LAST and change it accordingly. */ /* exit codes for all MySQL programs */ |