diff options
| -rw-r--r-- | mysys/my_gethwaddr.c | 3 | ||||
| -rw-r--r-- | plugin/feedback/url_http.cc | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/mysys/my_gethwaddr.c b/mysys/my_gethwaddr.c index bcc231eaf7e..d02ba822f73 100644 --- a/mysys/my_gethwaddr.c +++ b/mysys/my_gethwaddr.c @@ -152,7 +152,10 @@ my_bool my_gethwaddr(uchar *to) { if (info->Type == MIB_IF_TYPE_ETHERNET && info->AddressLength == ETHER_ADDR_LEN) + { res= memcpy_and_test(to, info->Address, ETHER_ADDR_LEN); + } + info = info->Next; } err: diff --git a/plugin/feedback/url_http.cc b/plugin/feedback/url_http.cc index de2877b0274..e1f60d60de7 100644 --- a/plugin/feedback/url_http.cc +++ b/plugin/feedback/url_http.cc @@ -198,7 +198,7 @@ int Url_http::send(const char* data, size_t data_length) } #ifdef HAVE_OPENSSL - struct st_VioSSLFd *ssl_fd; + struct st_VioSSLFd *UNINIT_VAR(ssl_fd); if (ssl) { buf[0]= 0; |