diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-06-02 20:46:03 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-06-02 20:46:03 +0300 |
| commit | 7daf5a5d0ee7b52508943c7095a2cc150abcf616 (patch) | |
| tree | 8de3d7e1875b8751450433ee53331ffb7322e7b5 /extra | |
| parent | b622ff7a25b7cd6c19ea90449f6b4815e92a7be5 (diff) | |
| parent | 86636a1656ffe7c6bf1468a2e623289d41bb9b5b (diff) | |
| download | mariadb-git-7daf5a5d0ee7b52508943c7095a2cc150abcf616.tar.gz | |
merge with 3.23
BitKeeper/deleted/.del-rpl_empty_master_crash.result:
Delete: mysql-test/r/rpl_empty_master_crash.result
BitKeeper/deleted/.del-rpl_empty_master_crash.test:
Delete: mysql-test/t/rpl_empty_master_crash.test
configure.in:
Auto merged
include/my_net.h:
Auto merged
include/my_pthread.h:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/t/func_math.test:
Auto merged
mysys/my_gethostbyname.c:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/item_func.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 6665ceebf1d..e380d920e9f 100644 --- a/extra/resolveip.c +++ b/extra/resolveip.c @@ -20,7 +20,6 @@ #include <my_global.h> #include <m_ctype.h> -#include <my_net.h> #include <my_sys.h> #include <m_string.h> #include <sys/types.h> @@ -30,6 +29,7 @@ #endif #include <arpa/inet.h> #include <netdb.h> +#include <my_net.h> #include <my_getopt.h> #if !defined(_AIX) && !defined(HAVE_UNIXWARE7_THREADS) && !defined(HAVE_UNIXWARE7_POSIX) && !defined(h_errno) |