diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2019-07-26 07:03:39 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2019-07-26 07:03:39 +0200 |
| commit | cf8c2a3c3b2eb05df419ce014b98a71b1e75ad6b (patch) | |
| tree | 0e9c8d48fda7b7494b5d3b220bc6af64e4f3e64a /plugin | |
| parent | fc77a66c7eb1b8e90753814aa567daeaabd0dd90 (diff) | |
| parent | 584d213235704113cf0d70319c0521d93b8744c6 (diff) | |
| download | mariadb-git-cf8c2a3c3b2eb05df419ce014b98a71b1e75ad6b.tar.gz | |
Merge branch '10.1' into 10.2
Diffstat (limited to 'plugin')
| -rw-r--r-- | plugin/win_auth_client/common.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugin/win_auth_client/common.cc b/plugin/win_auth_client/common.cc index 0cfbb2e802c..27f1685e200 100644 --- a/plugin/win_auth_client/common.cc +++ b/plugin/win_auth_client/common.cc @@ -1,4 +1,4 @@ -/* Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -504,7 +504,7 @@ const char* get_last_error_message(Error_message_buf buf) buf[0]= '\0'; FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, NULL, error, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), - (LPTSTR)buf, sizeof(buf), NULL ); + (LPTSTR)buf, sizeof(Error_message_buf), NULL); return buf; } |