Commit 73ecffdb authored by Jon Olav Hauglid's avatar Jon Olav Hauglid

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.
parent 71bb332a
/* 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 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 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, uint *errors) ...@@ -183,7 +183,7 @@ char * ip_to_hostname(struct in_addr *in, uint *errors)
&tmp_hostent,buff,sizeof(buff),&tmp_errno))) &tmp_hostent,buff,sizeof(buff),&tmp_errno)))
{ {
DBUG_PRINT("error",("gethostbyaddr_r returned %d",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), if (!(check=my_gethostbyname_r(hp->h_name,&tmp_hostent2,buff2,sizeof(buff2),
&tmp_errno))) &tmp_errno)))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment