diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-05-02 20:58:45 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-05-02 20:58:45 +0300 |
| commit | e415ba0fb2c57eaf370e84a3a9c8d831f820a560 (patch) | |
| tree | f113a8024de4ee4f1bc19aae98c19a2835f5b4e7 /sql/hostname.cc | |
| parent | 046418ad956c98c3788d79650fcb50479844df3b (diff) | |
| parent | a1f7ceb281f9d87c9baea125ebab26f99a0370f8 (diff) | |
| download | mariadb-git-e415ba0fb2c57eaf370e84a3a9c8d831f820a560.tar.gz | |
Merge with MySQL 5.1.57/58
Moved some BSD string functions from Unireg
Diffstat (limited to 'sql/hostname.cc')
| -rw-r--r-- | sql/hostname.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/hostname.cc b/sql/hostname.cc index ec090cbe02f..dfcdd3edd90 100644 --- a/sql/hostname.cc +++ b/sql/hostname.cc @@ -1,4 +1,5 @@ -/* Copyright (C) 2000-2006 MySQL AB +/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. + Copyright (c) 2011, Monty Program Ab 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 +184,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))) |