From: Jon Olav Hauglid
Date: April 20 2011 9:32am
Subject: bzr commit into mysql-5.1 branch (jon.hauglid:3667) Bug#12377872
List-Archive: http://lists.mysql.com/commits/135779
X-Bug: 12377872
Message-Id: <201104200932.p3K9WewJ020296@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3162998932061595157=="

--===============3162998932061595157==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#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)))


--===============3162998932061595157==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/jon.hauglid@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: jon.hauglid@stripped
# target_branch: file:///export/home/x/mysql-5.1-bug12377872/
# testament_sha1: 5132684d120ad248a13325c4189567f6677fa5da
# timestamp: 2011-04-20 11:32:32 +0200
# base_revision_id: sergey.glukhov@stripped\
#   t0iwi2pxtos5w7x1
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWUq5SMAAAblfgEAweHf//3/1
nqC////wUARmvO6C7Va6J27HsJRIyCMTEyDFNNJ+oT0jTIZGyaJ5RgNQZIEMRhEamU8oYm0j1AHq
HlAADIDKGgoxpTynqHqHpPKeptQDQNAAAABlFGmgNqepoAaAAaaAANAAAJJApk0nqepoyMT0Q00x
AAAAAAePrIXWLuzZxVWrpVMlGfXgxCC5rHrVVzOyTXSI+cfnNm7g3+ANmHIstHHK1Wt76senw7T1
0YpH4Dq4vT+eXk9E+x70r+FbP8JbUMcHz3ZJoweiPONe0g+W0MDQ2U38m5ffbdTnC1A9tUY/DB+F
veLLUD8wCVsFdlsKYbs9kiQMxLlzrqdNagkQWksOe6+EaLG7ILfLRmUHOwjJDiI4QxIYxMgzsRD4
vuFEfIIp5e2JQvqArSB+5tyKd9xFBQYRj4GkiAcxtOG6yb87xfyEQ42Bfhjp6ni14xyPTZ7BKzWq
eyKJ+jSrW0M1wVyTqMZpiAjGEDZyQBlDoOgwTApdZPouAeEDpvBseJlqnZjQNAMgV1yc2gWMLHmW
yU3laEbK4EDVzi524R1rvRtBs7JhulW3tupmw2XjmrmNagwVG4636hjlJsmZ7DDuVccRdUbQXMq1
VorkLhPbUsX1uL+mEUxq0LFqhS85GIaF36h/TIRogULVAtXBTDELcFXMjFtswsPOh5WwG+5QmJLE
8BhgNNo0jzSpRWNaqVxmU0SrDmsKlrK0DyHPVn3xo7sZFX0GvNm5iiJze248pDASqqr88qen9co3
a9vdD3x/73wbdjkj3ezFT3gekFOp29gTFGFWN7bpIJOQwvK62Uutsiv6W3oXC8bwJlbPN2NNGnIh
Z2dr5Gativh09AcOo6+oZtkRDVh3riUxNDjUCrWJL3wI5Bb2xDXq6sSZPGr28IqDE48FDfyCT+FM
uQMG9TRYaNhiNcZ2+KS3CbZtF0YqohRCIUq9E1UrUPquRtLS4ONLKnAh+I0ULtHmEQOrjkCtgC4s
JElhIJgeKOLPfFdWudmGMJLaI4XpYtbu+2eyxi8/jdVS+rPNhjKilMDU3ao3LwSK3L0lXZL72qng
KCcoVy1Dz0xYChj99qQGkn9bORy4aGFww5SQjQodjSRHAXpgqE515DlLRlgQInW5VnYMv5y9JysG
p9EtplXIyLYjERkFd5AlQUaXDpglbj6LqmwuQh5dRzBhqazUk0NO4zCyzTtbIKziWsG8ZrC9SsKQ
e4Lhl6tDIwhjkLEw/aAyuxnXifbwT4ydTVFsRLGrQXqCqOrrzZppidp4kGIMgVCDoL2hwDOtR3bw
xs6QYlCLUKGVeLazBUZXYknw82M4Iipc+zJEcL+AhlCdJON4ToCudiYbqaAxWqpUwPvrlhic8Q4y
7FLIGYJZtzEWYNBOFoMXQIWHqyzooNAho4sgZ5VXnUW3KeA1AhwboeimsTJxYpbNkwGMwX0pGDoA
Wsea+kVCA37+6kb3SDoqEwHEbGyY2dxargHBasprxPPmDgvmjjZhpoEwJkZF6oUcsrhgMD6BNpBQ
AYNZhpt4FxIZbKlFDS0AZikLKHimCahksrQxCtjJBep4y0iH+LuSKcKEglXKRgA=


--===============3162998932061595157==--