diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-08-27 17:12:44 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-08-27 17:12:44 +0300 |
| commit | ad6d95d3cb420557cfc7efa658181a8d20b4c154 (patch) | |
| tree | 984bb45ca187a6cc38c7132a9600d91515df564e /mysys/errors.c | |
| parent | 9bc9855c16f815e71223398ef17cd6052becc44e (diff) | |
| parent | 7909541953de43c7b7d16513c8d612cfe405af67 (diff) | |
| download | mariadb-git-ad6d95d3cb420557cfc7efa658181a8d20b4c154.tar.gz | |
Merge with MySQL 5.1.50
- Changed to still use bcmp() in certain cases becasue
- Faster for short unaligneed strings than memcmp()
- Bettern when using valgrind
- Changed to use my_sprintf() instead of sprintf() to get higher portability for old systems
- Changed code to use MariaDB version of select->skip_record()
- Removed -%::SCCS/s.% from Makefile.am:s to remove automake warnings
Diffstat (limited to 'mysys/errors.c')
| -rw-r--r-- | mysys/errors.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mysys/errors.c b/mysys/errors.c index fc63ac9d936..4c568952ee3 100644 --- a/mysys/errors.c +++ b/mysys/errors.c @@ -50,6 +50,8 @@ const char * NEAR globerrs[GLOBERRS]= "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", + "Can't change ownership of the file '%s' (Errcode: %d)", + "Can't change permissions of the file '%s' (Errcode: %d)", "Can't change mode for file '%s' to 0x%lx (Error: %d)", "Can't do seek on file '%s' (Errcode: %d)", "Warning: Can't copy ownership for file '%s' (Error: %d)" @@ -93,6 +95,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)"; EE(EE_CANT_CHMOD) = "Can't change mode for file '%s' to 0x%lx (Error: %d)"; EE(EE_CANT_SEEK) = "Can't do seek on file '%s' (Errcode: %d)"; EE(EE_CANT_COPY_OWNERSHIP)= "Warning: Can't copy ownership for file '%s' (Error: %d)"; |