summaryrefslogtreecommitdiff
path: root/plugin
diff options
context:
space:
mode:
authorOleksandr Byelkin <sanja@mariadb.com>2019-07-25 13:27:11 +0200
committerOleksandr Byelkin <sanja@mariadb.com>2019-07-25 13:27:11 +0200
commitae476868a5394041a00e75a29c7d45917e8dfae8 (patch)
treeb2f82005fe87bc5ce1ea92504b505a9d4e8b9781 /plugin
parent8d0dabc56b09c6b40db15aac7da0da43d988759d (diff)
parent2536c0b1ebf6c5012ae34435d82fb2f5fa54aea5 (diff)
downloadmariadb-git-ae476868a5394041a00e75a29c7d45917e8dfae8.tar.gz
Merge branch '5.5' into 10.1
Diffstat (limited to 'plugin')
-rw-r--r--plugin/win_auth_client/common.cc4
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;
}