diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-09-20 16:53:20 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-09-20 16:53:20 +0300 |
| commit | 44fd2c4b24b35cdb5f573395fe07800d05b7c8b6 (patch) | |
| tree | 13c130d521c7c1dea3bc9b8b26d9057a1c268668 /include/my_global.h | |
| parent | 5d9d379329abcbb661ed6c027efbb9fd763958c6 (diff) | |
| parent | 0792aff161132fb953510555fe45544991dec95d (diff) | |
| download | mariadb-git-44fd2c4b24b35cdb5f573395fe07800d05b7c8b6.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'include/my_global.h')
| -rw-r--r-- | include/my_global.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/include/my_global.h b/include/my_global.h index 2eed45e8407..ac972c1b49e 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -1053,10 +1053,12 @@ typedef ulong myf; /* Type of MyFlags in my_funcs */ static inline char *dlerror(void) { static char win_errormsg[2048]; - FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM - | FORMAT_MESSAGE_IGNORE_INSERTS - | FORMAT_MESSAGE_MAX_WIDTH_MASK, - 0, GetLastError(), 0, win_errormsg, 2048, NULL); + FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | + FORMAT_MESSAGE_IGNORE_INSERTS | + FORMAT_MESSAGE_MAX_WIDTH_MASK, + 0, GetLastError(), + MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), + win_errormsg, 2048, NULL); return win_errormsg; } #define HAVE_DLOPEN 1 |