summaryrefslogtreecommitdiff
path: root/mysys/my_gethwaddr.c
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@montyprogram.com>2011-10-19 21:01:42 +0200
committerVladislav Vaintroub <wlad@montyprogram.com>2011-10-19 21:01:42 +0200
commit29c3debd3083fc54055f8e127a77484db44041d7 (patch)
treebc8a36456a540ef30261384563648716cd0bb871 /mysys/my_gethwaddr.c
parent9f79d2f9e133b5530f5e17360c2f5ae2fc33ea59 (diff)
parentaa327cdd484809f2603004a8690bbb2d105deb5e (diff)
downloadmariadb-git-29c3debd3083fc54055f8e127a77484db44041d7.tar.gz
merge 5.2
Diffstat (limited to 'mysys/my_gethwaddr.c')
-rw-r--r--mysys/my_gethwaddr.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/mysys/my_gethwaddr.c b/mysys/my_gethwaddr.c
index 391e652d406..e8e8c15bca1 100644
--- a/mysys/my_gethwaddr.c
+++ b/mysys/my_gethwaddr.c
@@ -151,7 +151,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: