bzr commit into mysql-5.1 branch (jon.hauglid:3667) Bug#12377872

[Jon Olav Hauglid]

#At file:///export/home/x/mysql-5.1-bug12377872/ based on revid:sergey.glukhov@stripped

 3667 Jon Olav Hauglid	2011-04-20
      BUG#12377872 ASSERTION FAILED: !_ENTERED WHEN GETHOSTBYADDR_R
                   FAILS ON SOLARIS
      
      This assertion was triggered if gethostbyaddr_r cannot do a
      reverse lookup on an ip address. The reason was a missing
      DBUG_RETURN macro. The problem affected only debug versions of
      the server.
      
      This patch fixes the problem by replacing return with DBUG_RETURN.
      No test case added.

    modified:
      sql/hostname.cc
=== modified file 'sql/hostname.cc'
--- a/sql/hostname.cc	2007-10-11 17:29:09 +0000
+++ b/sql/hostname.cc	2011-04-20 09:32:28 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2006 MySQL AB
+/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -183,7 +183,7 @@ char * ip_to_hostname(struct in_addr *in
 			   &tmp_hostent,buff,sizeof(buff),&tmp_errno)))
   {
     DBUG_PRINT("error",("gethostbyaddr_r returned %d",tmp_errno));
-    return 0;
+    DBUG_RETURN(0);
   }
   if (!(check=my_gethostbyname_r(hp->h_name,&tmp_hostent2,buff2,sizeof(buff2),
 				 &tmp_errno)))


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