diff options
| author | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-10-19 20:53:16 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-10-19 20:53:16 +0200 |
| commit | aa327cdd484809f2603004a8690bbb2d105deb5e (patch) | |
| tree | d50b1609b67d7174108044e7166b62a759b89fca /mysys | |
| parent | e3e60a4102d6918e4231e402bef89b1a6b2a20cb (diff) | |
| parent | 78eb1d48c91f260cab3f616d8a9a8de8040d2347 (diff) | |
| download | mariadb-git-aa327cdd484809f2603004a8690bbb2d105deb5e.tar.gz | |
merge from 5.1
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/my_gethwaddr.c | 3 |
1 files changed, 3 insertions, 0 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: |