diff options
| author | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2011-04-20 11:32:28 +0200 |
|---|---|---|
| committer | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2011-04-20 11:32:28 +0200 |
| commit | f3b024cafa4c316774c8122031a1bbbc08a83379 (patch) | |
| tree | adb747f95fee7d15918229f918e768b479011b98 /sql | |
| parent | 90bbf9d615a592c31464c1a689040a9758581fdd (diff) | |
| download | mariadb-git-f3b024cafa4c316774c8122031a1bbbc08a83379.tar.gz | |
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.
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/hostname.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/hostname.cc b/sql/hostname.cc index c8cf46383a9..9796755e9fb 100644 --- a/sql/hostname.cc +++ b/sql/hostname.cc @@ -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, uint *errors) &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))) |