diff options
| author | unknown <bar@mysql.com> | 2005-02-22 16:37:25 +0400 |
|---|---|---|
| committer | unknown <bar@mysql.com> | 2005-02-22 16:37:25 +0400 |
| commit | 209b24473cd04a16d1cc548f5e7d0a5f1ebfefe2 (patch) | |
| tree | 95062708b51b3445411d11fd00f9ed76c9c8db40 /include | |
| parent | 2fb807d1d0a817c177e02cee7b508b6122ce832e (diff) | |
| download | mariadb-git-209b24473cd04a16d1cc548f5e7d0a5f1ebfefe2.tar.gz | |
Bug#8349 myisamchk: --set-charset does not work
What we need to be able to set in myisamchk is
actually a collation, not a character set. This
fix just changes to display the proper error message.
include/mysys_err.h:
New mysys error message "unknown collation".
mysys/charset.c:
Display more proper error when a collation is not found.
mysys/errors.c:
New "unknown collation" error.
Diffstat (limited to 'include')
| -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 */ |