Commit 7e3fd8ce authored by tim@cane.mysql.fi's avatar tim@cane.mysql.fi
Browse files

Merge work.mysql.com:/home/bk/mysql 

into cane.mysql.fi:/usr/home/tim/my/work
parents 45d537d5 6ea69788

acconfig.h

+3 −0
Original line number Diff line number Diff line
@@ -189,6 +189,9 @@ 
/* Define as the base type of the last arg to accept */

#undef SOCKET_SIZE_TYPE



/* Last argument to get/setsockopt */

#undef SOCKOPT_OPTLEN_TYPE



#undef SPEED_T_IN_SYS_TYPES

#undef SPRINTF_RETURNS_PTR

#undef SPRINTF_RETURNS_INT

configure.in

+5 −0
Original line number Diff line number Diff line
@@ -1177,6 +1177,11 @@ AC_C_BIGENDIAN 
#---START: Used in for client configure

# Check base type of last arg to accept

MYSQL_TYPE_ACCEPT

case "$SYSTEM_TYPE" in

*bsdi* ) AC_DEFINE_UNQUOTED(SOCKOPT_OPTLEN_TYPE, size_t);;

* ) AC_DEFINE_UNQUOTED(SOCKOPT_OPTLEN_TYPE, size_socket);;

esac



#---END:

# Find where the stack goes

MYSQL_STACK_DIRECTION

libmysql/Makefile.am

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ include $(srcdir)/Makefile.shared 
libmysqlclient_la_SOURCES = $(target_sources)

libmysqlclient_la_LIBADD = $(target_libadd)

libmysqlclient_la_LDFLAGS = $(target_ldflags)

EXTRA_DIST = Makefile.shared



# This is called from the toplevel makefile

link_sources:

libmysql/Makefile.shared

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ mystringsobjects = strmov.lo strxmov.lo strnmov.lo strmake.lo strend.lo \ 
			int2str.lo str2int.lo strinstr.lo strcont.lo \

			strcend.lo \

			bchange.lo bmove.lo bmove_upp.lo longlong2str.lo \

			strtoull.lo strtoll.lo llstr.lo strto.lo \

			strtoull.lo strtoll.lo llstr.lo \

			ctype.lo $(LTCHARSET_OBJS)

mystringsextra= 	strto.c ctype_autoconf.c

dbugobjects =		dbug.lo # IT IS IN SAFEMALLOC.C sanity.lo

libmysql/libmysql.c

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ static int connect2(my_socket s, const struct sockaddr *name, uint namelen, 
  return connect(s, (struct sockaddr*) name, namelen);

#else

  int flags, res, s_err;

  size_socket s_err_size = sizeof(uint);

  SOCKOPT_OPTLEN_TYPE s_err_size = sizeof(uint);

  fd_set sfds;

  struct timeval tv;

  time_t start_time, now_time;