mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-15 11:27:39 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge mysql.com:/home/kent/bk/windows-cleanup/mysql-5.0-build

Browse source 
into  mysql.com:/home/kent/bk/windows-cleanup/mysql-5.1-build


extra/CMakeLists.txt:
  Auto merged
extra/resolveip.c:
  Auto merged
scripts/CMakeLists.txt:
  Auto merged
scripts/Makefile.am:
  Auto merged
scripts/make_win_bin_dist:
  Auto merged
scripts/mysql_convert_table_format.sh:
  Auto merged
scripts/mysqld_multi.sh:
  Auto merged
BitKeeper/deleted/.del-mysql_explain_log.sh~5ddc62808e16bd57:
  Auto merged
BitKeeper/deleted/.del-mysql_tableinfo.sh~c715458838a2a818:
  Auto merged
This commit is contained in:
unknown 2007-12-28 01:07:42 +01:00
commit 1e41f36c56
13 changed files with 1045 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

14
extra/resolveip.c
View file

@ -21,13 +21,15 @@
#include <m_ctype.h>
#include <my_sys.h>
#include <m_string.h>
#include <sys/types.h>
#include <sys/socket.h>
#ifndef HAVE_BROKEN_NETINET_INCLUDES
#include <netinet/in.h>
#ifndef WIN32
# include <sys/types.h>
# include <sys/socket.h>
# ifndef HAVE_BROKEN_NETINET_INCLUDES
# include <netinet/in.h>
# endif
# include <arpa/inet.h>
# include <netdb.h>
#endif
#include <arpa/inet.h>
#include <netdb.h>
#include <my_net.h>
#include <my_getopt.h>