merge from 5.1

mysys/my_gethwaddr.c

@@ -152,8 +152,11 @@ 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:
   return res;

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;