diff options
author | bar@mysql.com <> | 2005-02-23 17:03:34 +0400 |
---|---|---|
committer | bar@mysql.com <> | 2005-02-23 17:03:34 +0400 |
commit | a88af6c1dd14c5d2a3c50935fd13016a552efa4c (patch) | |
tree | 4816d63590de39ffa898bdb571300ca8a5b73c9c /mysys/errors.c | |
parent | f3c0e35e9fba08f42b70ffb7e99ecdc76f4d8c0a (diff) | |
parent | 4996daec1909a9e0208a6c3df5eea5fd01e683ba (diff) | |
download | mariadb-git-a88af6c1dd14c5d2a3c50935fd13016a552efa4c.tar.gz |
Merge
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 |