diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-09-20 12:38:25 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-09-20 12:38:25 +0300 |
commit | 0c0a56902898038726342ae11decf4bf5421d339 (patch) | |
tree | ed1f66692ac80cce3d168831a72f22100f5ee928 /include/my_global.h | |
parent | ef784c4ea2ce93bc8cdd953e84456e69f5875dda (diff) | |
parent | 5dcc56be4d9979e9be927b68f4e62df7a6c3d5a1 (diff) | |
download | mariadb-git-0c0a56902898038726342ae11decf4bf5421d339.tar.gz |
Merge 10.3 into 10.4
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 a4c694fd196..b60fa59dfaa 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -1088,7 +1088,7 @@ static inline char *dlerror(void) { static char win_errormsg[2048]; FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM, - 0, GetLastError(), 0, win_errormsg, 2048, NULL); + 0, GetLastError(), MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), win_errormsg, 2048, NULL); return win_errormsg; } #define HAVE_DLOPEN 1 |