diff options
| author | unknown <monty@narttu.mysql.fi> | 2003-10-06 21:21:04 +0300 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2003-10-06 21:21:04 +0300 |
| commit | dfacd7c5fa3fbdb5efff71cca71acff26da0aedd (patch) | |
| tree | cf2239db90d9ebf6491864b5c92a95940fe26e82 /extra | |
| parent | 63aebfe5ec8fc2424e80b7f1c02d63dec1c66e04 (diff) | |
| parent | b1ef6fc39ca16e4624d3320f9f4ff1c845e016cf (diff) | |
| download | mariadb-git-dfacd7c5fa3fbdb5efff71cca71acff26da0aedd.tar.gz | |
Merge with 3.23.58
BitKeeper/etc/logging_ok:
auto-union
mytest-old.c:
Merge rename: VC++Files/libmysqltest/mytest.c -> mytest-old.c
BitKeeper/deleted/.del-mysqlshutdown.c:
Delete: VC++Files/mysqlshutdown/mysqlshutdown.c
BitKeeper/deleted/.del-mysqlshutdown.rc:
Delete: VC++Files/mysqlshutdown/mysqlshutdown.rc
BitKeeper/deleted/.del-mysqlwatch.c:
Delete: VC++Files/mysqlwatch/mysqlwatch.c
BitKeeper/deleted/.del-thr_test.c:
Delete: VC++Files/thr_test/thr_test.c
BitKeeper/deleted/.del-make_win_src_distribution.sh:
Delete: scripts/make_win_src_distribution.sh
BitKeeper/deleted/.del-.fgl~cac6624e1ac6ee1d:
Auto merged
BitKeeper/deleted/.del-Build.tsb~f3be7d512e6d5b74:
Auto merged
BitKeeper/deleted/.del-Clients and Tools.fgl~826a8e3f651af365:
Auto merged
BitKeeper/deleted/.del-Default.cdf~1da6505528200d5e:
Auto merged
BitKeeper/deleted/.del-Default.fdf~466762fdf65e1477:
Auto merged
BitKeeper/deleted/.del-Default.fgl~45b9e847fa4da131:
Auto merged
BitKeeper/deleted/.del-Default.fgl~a86ce70180b5aba4:
Auto merged
BitKeeper/deleted/.del-Default.rge~2218627c2a901409:
Auto merged
BitKeeper/deleted/.del-Default.shl~a02a9093c2b6b0d9:
Auto merged
BitKeeper/deleted/.del-Default.shl~e18d3f10bef97a28:
Auto merged
BitKeeper/deleted/.del-Development.fgl~ca1458874a3fef81:
Auto merged
BitKeeper/deleted/.del-Grant Tables.fgl~31e527d126c42d90:
Auto merged
BitKeeper/deleted/.del-MySQL 3.23.com.ipr~eb817edea43c6e6e:
Auto merged
BitKeeper/deleted/.del-SETUP.BMP~77e20d86bceb4903:
Auto merged
BitKeeper/deleted/.del-Servers.fgl~36147accb82f759:
Auto merged
BitKeeper/deleted/.del-Setup.dbg~688e9d3ec362ec34:
Auto merged
BitKeeper/deleted/.del-Setup.ino~85f07a856a69a722:
Auto merged
BitKeeper/deleted/.del-Setup.ins~ab68efc133d8411e:
Auto merged
BitKeeper/deleted/.del-Setup.obs~2f09140119879bc6:
Auto merged
BitKeeper/deleted/.del-Setup.rul~14510a994d515f19:
Auto merged
BitKeeper/deleted/.del-Setup.tsb~e74dbc7688d4019a:
Auto merged
BitKeeper/deleted/.del-infolist.txt~58b203247936d266:
Auto merged
BitKeeper/deleted/.del-infolist.txt~ee370f4771c83a97:
Auto merged
BitKeeper/deleted/.del-value.shl~718b5b291d5ff04d:
Auto merged
BitKeeper/deleted/.del-value.shl~98c2851db96b919e:
Auto merged
BitKeeper/deleted/.del-Documentation.fgl~cf0ac866737a5c7d:
Auto merged
configure.in:
Merge with 3.23.58 (Keep old code)
sql/slave.cc:
Merge with 3.23.58 (Keep old code)
sql/sql_parse.cc:
Merge with 3.23.58 (Keep old code)
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/resolveip.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/extra/resolveip.c b/extra/resolveip.c index 91f23bf5b00..f3c09b88e22 100644 --- a/extra/resolveip.c +++ b/extra/resolveip.c @@ -37,12 +37,10 @@ extern int h_errno; #endif #ifndef HAVE_IN_ADDR_T -#define in_addr_t u_long +#define in_addr_t ulong #endif -static my_bool silent; - static struct my_option my_long_options[] = { {"help", '?', "Displays this help and exits.", |