diff options
author | Davi Arnaut <davi.arnaut@oracle.com> | 2010-07-20 16:30:10 -0300 |
---|---|---|
committer | Davi Arnaut <davi.arnaut@oracle.com> | 2010-07-20 16:30:10 -0300 |
commit | 182599dd13f280ce4d51333bca98dbd5e4816bba (patch) | |
tree | c02d7fe89f0e9d9cbd05e83dd77ceeed812eb293 /mysys/errors.c | |
parent | 774194634297aebf6ecbbda7c5601c796f43e5fc (diff) | |
parent | 9a5fa17fd3c4885262e31bf14cf495d02e5f6b27 (diff) | |
download | mariadb-git-182599dd13f280ce4d51333bca98dbd5e4816bba.tar.gz |
Merge of mysql-5.1-bugteam into mysql-trunk-merge.
Diffstat (limited to 'mysys/errors.c')
-rw-r--r-- | mysys/errors.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mysys/errors.c b/mysys/errors.c index 9342ab2d2dd..8bc310652f1 100644 --- a/mysys/errors.c +++ b/mysys/errors.c @@ -49,7 +49,9 @@ const char *globerrs[GLOBERRS]= "Can't sync file '%s' to disk (Errcode: %d)", "Collation '%s' is not a compiled collation and is not specified in the '%s' file", "File '%s' not found (Errcode: %d)", - "File '%s' (fileno: %d) was not closed" + "File '%s' (fileno: %d) was not closed", + "Can't change ownership of the file '%s' (Errcode: %d)", + "Can't change permissions of the file '%s' (Errcode: %d)", }; void init_glob_errs(void) @@ -90,6 +92,8 @@ void init_glob_errs() EE(EE_UNKNOWN_COLLATION)= "Collation '%s' is not a compiled collation and is not specified in the %s file"; EE(EE_FILENOTFOUND) = "File '%s' not found (Errcode: %d)"; EE(EE_FILE_NOT_CLOSED) = "File '%s' (fileno: %d) was not closed"; + EE(EE_CHANGE_OWNERSHIP) = "Can't change ownership of the file '%s' (Errcode: %d)"; + EE(EE_CHANGE_PERMISSIONS) = "Can't change permissions of the file '%s' (Errcode: %d)"; } #endif |