diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-09-21 10:07:09 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-09-21 10:07:09 +0300 |
| commit | a8e45404765db6bc6c57dab3cc834e92a44d0110 (patch) | |
| tree | 901416c2f3931ea4b9df5a1d95e6c358a7954a25 /include | |
| parent | 4a7367d5282978207ad91e0b595b75a35dc37fec (diff) | |
| parent | 4345d9310080e6e4cbf1040263a2653f7d3d9227 (diff) | |
| download | mariadb-git-a8e45404765db6bc6c57dab3cc834e92a44d0110.tar.gz | |
Merge 10.8 into 10.9
Diffstat (limited to 'include')
| -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 22968900b0a..a849597f468 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -1061,10 +1061,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 |