diff options
| author | unknown <sasha@mysql.sashanet.com> | 2001-09-19 14:39:11 -0600 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2001-09-19 14:39:11 -0600 |
| commit | 30f4ea704431158f96163e7e62ad28a98164bbbf (patch) | |
| tree | 79cfad2bba3d731b1adc961f57f00e92a10581f9 /libmysql | |
| parent | 5dbd7397bd0d268b02d2aacb16b8c288fcfa2e93 (diff) | |
| parent | ba2c3fcd6a4eacd1c09fbebd823c0efdeefeedac (diff) | |
| download | mariadb-git-30f4ea704431158f96163e7e62ad28a98164bbbf.tar.gz | |
merged
BitKeeper/etc/ignore:
auto-union
BitKeeper/deleted/.del-test-ssl~ed0a50364f2a51d7:
Auto merged
include/Makefile.am:
Auto merged
include/mysql.h:
Auto merged
libmysql/libmysql.c:
Auto merged
mysys/md5.c:
Auto merged
sql/Makefile.am:
Auto merged
Diffstat (limited to 'libmysql')
| -rw-r--r-- | libmysql/Makefile.shared | 4 | ||||
| -rw-r--r-- | libmysql/libmysql.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/libmysql/Makefile.shared b/libmysql/Makefile.shared index 8513b92624e..e00a961cabe 100644 --- a/libmysql/Makefile.shared +++ b/libmysql/Makefile.shared @@ -31,7 +31,7 @@ noinst_PROGRAMS = conf_to_src CHARSET_OBJS=@CHARSET_OBJS@ LTCHARSET_OBJS= ${CHARSET_OBJS:.o=.lo} -target_sources = libmysql.c net.c password.c \ +target_sources = libmysql.c net.c password.c manager.c \ get_password.c errmsg.c mystringsobjects = strmov.lo strxmov.lo strnmov.lo strmake.lo strend.lo \ @@ -56,7 +56,7 @@ mysysobjects1 = my_init.lo my_static.lo my_malloc.lo my_realloc.lo \ thr_mutex.lo mulalloc.lo string.lo default.lo \ my_compress.lo array.lo my_once.lo list.lo my_net.lo \ charset.lo hash.lo mf_iocache.lo my_seek.lo \ - my_pread.lo mf_cache.lo my_vsnprintf.lo + my_pread.lo mf_cache.lo my_vsnprintf.lo md5.lo # Not needed in the minimum library mysysobjects2 = getopt.lo getopt1.lo getvar.lo my_lib.lo diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index eb0e2f1820a..1cdfa7c51c8 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -140,12 +140,12 @@ static MYSQL* spawn_init(MYSQL* parent, const char* host, * A modified version of connect(). connect2() allows you to specify * a timeout value, in seconds, that we should wait until we * derermine we can't connect to a particular host. If timeout is 0, -* connect2() will behave exactly like connect(). +* my_connect() will behave exactly like connect(). * * Base version coded by Steve Bernacki, Jr. <steve@navinet.net> *****************************************************************************/ -static int connect2(my_socket s, const struct sockaddr *name, uint namelen, +int my_connect(my_socket s, const struct sockaddr *name, uint namelen, uint timeout) { #if defined(__WIN__) || defined(OS2) @@ -1523,7 +1523,7 @@ mysql_real_connect(MYSQL *mysql,const char *host, const char *user, bzero((char*) &UNIXaddr,sizeof(UNIXaddr)); UNIXaddr.sun_family = AF_UNIX; strmov(UNIXaddr.sun_path, unix_socket); - if (connect2(sock,(struct sockaddr *) &UNIXaddr, sizeof(UNIXaddr), + if (my_connect(sock,(struct sockaddr *) &UNIXaddr, sizeof(UNIXaddr), mysql->options.connect_timeout) <0) { DBUG_PRINT("error",("Got error %d on connect to local server",socket_errno)); @@ -1623,7 +1623,7 @@ mysql_real_connect(MYSQL *mysql,const char *host, const char *user, } #endif sock_addr.sin_port = (ushort) htons((ushort) port); - if (connect2(sock,(struct sockaddr *) &sock_addr, sizeof(sock_addr), + if (my_connect(sock,(struct sockaddr *) &sock_addr, sizeof(sock_addr), mysql->options.connect_timeout) <0) { DBUG_PRINT("error",("Got error %d on connect to '%s'",socket_errno,host)); |