diff options
| author | Igor Babaev <igor@askmonty.org> | 2012-02-01 15:48:02 -0800 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2012-02-01 15:48:02 -0800 |
| commit | 7b79d8a33f56d178c78209f910a0694807a63f8f (patch) | |
| tree | 3d4a8131e8688c6599461bfce72bb87c718a53e4 /mysys | |
| parent | 7ed15e6e50aec65560d8988fc5713f1f489b6616 (diff) | |
| parent | 81690cf326e09799ca77d9f7bc5601905b706548 (diff) | |
| download | mariadb-git-7b79d8a33f56d178c78209f910a0694807a63f8f.tar.gz | |
Merge 5.2->5.3 in preparation for the release of mariadb-5.3.4-rc.
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/my_gethwaddr.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysys/my_gethwaddr.c b/mysys/my_gethwaddr.c index c96af3f1018..c4ab39dbcf1 100644 --- a/mysys/my_gethwaddr.c +++ b/mysys/my_gethwaddr.c @@ -101,14 +101,14 @@ my_bool my_gethwaddr(uchar *to) uint i; for (i= 0; res && i < ifc.ifc_len / sizeof(ifr[0]); i++) { -#ifdef SIOCGIFHWADDR +#ifdef __linux__ if (ioctl(fd, SIOCGIFHWADDR, &ifr[i]) >= 0) res= memcpy_and_test(to, (uchar *)&ifr[i].ifr_hwaddr.sa_data, ETHER_ADDR_LEN); #else /* - A bug in OpenSolaris prevents non-root from getting a mac address: - http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=4720634 + A bug in OpenSolaris used to prevent non-root from getting a mac address: + {no url. Oracle killed the old OpenSolaris bug database} Thus, we'll use an alternative method and extract the address from the arp table. |