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 /mysys/errors.c | |
| 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 'mysys/errors.c')
| -rw-r--r-- | mysys/errors.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysys/errors.c b/mysys/errors.c index 5f548cad480..d321e7f6125 100644 --- a/mysys/errors.c +++ b/mysys/errors.c @@ -49,6 +49,7 @@ const char * NEAR globerrs[GLOBERRS]= "Can't create symlink '%s' pointing at '%s' (Error %d)", "Error on realpath() on '%s' (Error %d)", "Can't sync file '%s' to disk (Errcode: %d)", + "Collation '%s' is not a compiled collation and is not specified in the '%s' file", }; void init_glob_errs(void) @@ -87,5 +88,6 @@ void init_glob_errs() EE(EE_CANT_SYMLINK)= "Can't create symlink '%s' pointing at '%s' (Error %d)"; EE(EE_REALPATH)= "Error on realpath() on '%s' (Error %d)"; EE(EE_SYNC)= "Can't sync file '%s' to disk (Errcode: %d)"; + EE(EE_UNKNOWN_COLLATION)= "Collation '%s' is not a compiled collation and is not specified in the %s file"; } #endif |