diff options
author | unknown <serg@serg.mylan> | 2003-08-21 21:39:22 +0200 |
---|---|---|
committer | unknown <serg@serg.mylan> | 2003-08-21 21:39:22 +0200 |
commit | ec4d0edf85b414bc817b81f9cbae01299f2fa463 (patch) | |
tree | fa1fbc9fd6436dcd94178c8b46480075cd54f8b8 /extra | |
parent | 11b6ebf193b241cfd68e12126b6f1a4d5f4db575 (diff) | |
parent | b8de463ea17289747fe940ba048707498336f951 (diff) | |
download | mariadb-git-ec4d0edf85b414bc817b81f9cbae01299f2fa463.tar.gz |
merged
extra/resolveip.c:
Auto merged
sql/item.cc:
Auto merged
Diffstat (limited to 'extra')
-rw-r--r-- | extra/resolveip.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/extra/resolveip.c b/extra/resolveip.c index 52d71d40a64..9851ec49605 100644 --- a/extra/resolveip.c +++ b/extra/resolveip.c @@ -109,7 +109,7 @@ static int get_options(int *argc,char ***argv) int main(int argc, char **argv) { struct hostent *hpaddr; - u_long taddr; + in_addr_t taddr; char *ip,**q; int error=0; |