bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:3871)

[Magnus Blåudd]

#At file:///home/msvensson/mysql/7.0/ based on revid:magnus.blaudd@stripped

 3871 Magnus Blåudd	2010-10-19
      ndb
       - backport fix for "suggest parentheses around" warning from 5.5

    modified:
      sql/sql_acl.cc
=== modified file 'sql/sql_acl.cc'
--- a/sql/sql_acl.cc	2010-10-12 14:53:28 +0000
+++ b/sql/sql_acl.cc	2010-10-19 07:53:03 +0000
@@ -1828,10 +1828,10 @@ bool hostname_requires_resolving(const c
   size_t localhost_len= strlen(my_localhost);
 
   if (hostname == my_localhost ||
-      hostname_len == localhost_len &&
-      !my_strnncoll(system_charset_info,
-                    (const uchar *) hostname,  hostname_len,
-		    (const uchar *) my_localhost, strlen(my_localhost)))
+      (hostname_len == localhost_len &&
+       !my_strnncoll(system_charset_info,
+                     (const uchar *) hostname,  hostname_len,
+                     (const uchar *) my_localhost, strlen(my_localhost))))
   {
     return FALSE;
   }

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