diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-12-13 13:37:21 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-12-13 13:37:21 +0200 |
| commit | 621041b67698b040080b33928883336967687e1e (patch) | |
| tree | 75b5591e343f313dab07998b06ddeb4aa76233e3 /include/my_global.h | |
| parent | 541500295abdba7fa619065069291ac9c1dd6e83 (diff) | |
| parent | 8e613458e1ad797b5e2c7870ffe1c3d5100dbbee (diff) | |
| download | mariadb-git-621041b67698b040080b33928883336967687e1e.tar.gz | |
Merge 10.0 into 10.1
Also, apply the MDEV-17957 changes to encrypted page checksums,
and remove error message output from the checksum function,
because these messages would be useless noise when mariabackup
is retrying reads of corrupted-looking pages, and not that
useful during normal server operation either.
The error messages in fil_space_verify_crypt_checksum()
should be refactored separately.
Diffstat (limited to 'include/my_global.h')
| -rw-r--r-- | include/my_global.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/my_global.h b/include/my_global.h index dcfd607b455..36e4b5368fa 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -1082,7 +1082,7 @@ typedef ulong myf; /* Type of MyFlags in my_funcs */ static inline char *dlerror(void) { static char win_errormsg[2048]; - FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, + FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM, 0, GetLastError(), 0, win_errormsg, 2048, NULL); return win_errormsg; } |