diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-12-13 15:47:38 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-12-13 15:47:38 +0200 |
| commit | 2e5aea4bab65544a44c7983759f80c5823780f76 (patch) | |
| tree | cdb64114b9375fc7705f68f898f695d1031c00a5 /include | |
| parent | ad3346dddf419aed3e5d16066471fd5022af1795 (diff) | |
| parent | 621041b67698b040080b33928883336967687e1e (diff) | |
| download | mariadb-git-2e5aea4bab65544a44c7983759f80c5823780f76.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'include')
| -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 8651956892c..719464933b8 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -1084,7 +1084,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; } |