bzr commit into mysql-5.1-telco-7.1 branch (magnus.blaudd:3896)

[Magnus Blåudd]

#At file:///home/msvensson/mysql/tmp/mMQU5KW1rU/7.1/ based on revid:magnus.blaudd@stripped3qtxdbr

 3896 Magnus Blåudd	2010-10-19 [merge]
      Merge 7.0 -> 7.1

    modified:
      vio/viosocket.c
=== modified file 'vio/viosocket.c'
--- a/vio/viosocket.c	2010-05-26 09:50:01 +0000
+++ b/vio/viosocket.c	2010-10-19 12:05:56 +0000
@@ -856,8 +856,11 @@ my_bool vio_get_normalized_ip_string(con
                                      char *ip_string,
                                      size_t ip_string_size)
 {
-  struct sockaddr_storage norm_addr_storage;
-  struct sockaddr *norm_addr= (struct sockaddr *) &norm_addr_storage;
+  union {
+    struct sockaddr_storage norm_addr_storage;
+    struct sockaddr _avoid_strict_alias_warning;
+  } tmp_addr;
+  struct sockaddr *norm_addr= (struct sockaddr *) &tmp_addr.norm_addr_storage;
   int norm_addr_length;
   int err_code;
 

No bundle (reason: revision is a merge).