bzr push into mysql-5.5-bugfixing branch (vasil.dimov:3201 to 3202)

[vasil.dimov]

 3202 Vasil Dimov	2010-09-09
      Fix a compiler warning in my_gethwaddr.c:67:
      
      mysys/my_gethwaddr.c: In function 'my_gethwaddr':
      mysys/my_gethwaddr.c:67:11: error: pointer targets in assignment differ in signedness

    modified:
      mysys/my_gethwaddr.c
 3201 Davi Arnaut	2010-09-09
      Bug#53251: mysql_library_init fails on second execution with embedded library
      
      Add a virtual destructor. Class has virtual functions.

    modified:
      sql/set_var.h
=== modified file 'mysys/my_gethwaddr.c'
--- a/mysys/my_gethwaddr.c	revid:davi.arnaut@stripped
+++ b/mysys/my_gethwaddr.c	revid:vasil.dimov@stripped
@@ -64,7 +64,7 @@ my_bool my_gethwaddr(uchar *to)
     if (ifm->ifm_type == RTM_IFINFO)
     {
       sdl = (struct sockaddr_dl *)(ifm + 1);
-      addr=LLADDR(sdl);
+      addr=(uchar *)LLADDR(sdl);
       res=memcpy_and_test(to, addr, ETHER_ADDR_LEN);
     }
   }


Attachment: [text/bzr-bundle] bzr/[e-mail]